From 73e6a68c49d56f1d61f312234df60b90257d1824 Mon Sep 17 00:00:00 2001
From: Thomas van Dam <thomas@seda.xyz>
Date: Mon, 2 Dec 2024 10:58:29 +0100
Subject: [PATCH] feat(dr): return posted height along dr_id on
 post_data_request

Also satisfy clippy.
---
 .../src/msgs/data_requests/execute/post_request.rs   | 12 +++++++++++-
 contract/src/msgs/data_requests/test_helpers.rs      |  9 +++++++--
 contract/src/types.rs                                |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/contract/src/msgs/data_requests/execute/post_request.rs b/contract/src/msgs/data_requests/execute/post_request.rs
index cb460f31..c3af01f3 100644
--- a/contract/src/msgs/data_requests/execute/post_request.rs
+++ b/contract/src/msgs/data_requests/execute/post_request.rs
@@ -1,7 +1,14 @@
+use serde::{Deserialize, Serialize};
 use staking::state::STAKERS;
 
 use super::*;
 
+#[derive(Serialize, Deserialize)]
+pub(crate) struct ResponsePayload {
+    pub dr_id:  String,
+    pub height: u64,
+}
+
 impl ExecuteHandler for execute::post_request::Execute {
     /// Posts a data request to the pool
     fn execute(self, deps: DepsMut, env: Env, _info: MessageInfo) -> Result<Response, ContractError> {
@@ -29,7 +36,10 @@ impl ExecuteHandler for execute::post_request::Execute {
         let hex_dr_id = dr_id.to_hex();
         let res = Response::new()
             .add_attribute("action", "post_data_request")
-            .set_data(to_json_binary(&hex_dr_id)?)
+            .set_data(to_json_binary(&ResponsePayload {
+                dr_id:  hex_dr_id.clone(),
+                height: env.block.height,
+            })?)
             .add_event(Event::new("seda-data-request").add_attributes([
                 ("dr_id", hex_dr_id.clone()),
                 ("exec_program_id", self.posted_dr.exec_program_id.clone()),
diff --git a/contract/src/msgs/data_requests/test_helpers.rs b/contract/src/msgs/data_requests/test_helpers.rs
index dd1b062a..ca3e4351 100644
--- a/contract/src/msgs/data_requests/test_helpers.rs
+++ b/contract/src/msgs/data_requests/test_helpers.rs
@@ -8,7 +8,7 @@ use super::{
     msgs::data_requests::{execute, query, sudo},
     *,
 };
-use crate::{TestExecutor, TestInfo};
+use crate::{msgs::data_requests::execute::post_request::ResponsePayload, TestExecutor, TestInfo};
 
 pub fn calculate_dr_id_and_args(nonce: u128, replication_factor: u16) -> PostDataRequestArgs {
     let exec_program_id = nonce.to_string().hash().to_hex();
@@ -109,7 +109,12 @@ impl TestInfo {
         // set the chain height... will effect the height in the dr for us to sign.
         self.set_block_height(env_height);
         // someone posts a data request
-        self.execute(sender, &msg)
+        let res: ResponsePayload = self.execute(sender, &msg)?;
+        assert_eq!(
+            env_height, res.height,
+            "chain height does not match data request height"
+        );
+        Ok(res.dr_id)
     }
 
     #[track_caller]
diff --git a/contract/src/types.rs b/contract/src/types.rs
index e67037dc..fa09ac83 100644
--- a/contract/src/types.rs
+++ b/contract/src/types.rs
@@ -63,7 +63,7 @@ impl TryFrom<&[u8]> for PublicKey {
     }
 }
 
-impl<'a> PrimaryKey<'a> for PublicKey {
+impl PrimaryKey<'_> for PublicKey {
     type Prefix = ();
     type SubPrefix = ();
     type Suffix = ();