Fix: u128 deser errors

src/msgs/assert_json.rs

@@ -2,8 +2,7 @@
 //! if cosmwasm feature is enabled, also assert that we can deserialize the json back to the msg
 
 #[track_caller]
-#[cfg(not(feature = "cosmwasm"))]
-pub fn assert_json_ok<M>(msg: M, expected_json: serde_json::Value)
+pub fn assert_json_ser<M>(msg: M, expected_json: serde_json::Value)
 where
     M: serde::Serialize + std::fmt::Debug + PartialEq,
 {
@@ -12,8 +11,7 @@ where
 }
 
 #[track_caller]
-#[cfg(feature = "cosmwasm")]
-pub fn assert_json_ok<M>(msg: M, expected_json: serde_json::Value)
+pub fn assert_json_deser<M>(msg: M, expected_json: serde_json::Value)
 where
     M: serde::Serialize + std::fmt::Debug + PartialEq + serde::de::DeserializeOwned,
 {

src/msgs/data_requests/execute/commit_result.rs

@@ -53,13 +53,14 @@ impl ExecuteFactory {
         &self.hash
     }
 
-    pub fn create_message(self, proof: Vec<u8>) -> Execute {
+    pub fn create_message(self, proof: Vec<u8>) -> crate::msgs::ExecuteMsg {
         Execute {
             dr_id:      self.dr_id,
             commitment: self.commitment,
             public_key: self.public_key,
             proof:      proof.to_hex(),
         }
+        .into()
     }
 }
 

src/msgs/data_requests/execute/reveal_result.rs

@@ -62,7 +62,7 @@ impl ExecuteFactory {
         &self.hash
     }
 
-    pub fn create_message(self, proof: Vec<u8>) -> Execute {
+    pub fn create_message(self, proof: Vec<u8>) -> crate::msgs::ExecuteMsg {
         Execute {
             dr_id:       self.dr_id,
             reveal_body: self.reveal_body,
@@ -71,6 +71,7 @@ impl ExecuteFactory {
             stderr:      self.stderr,
             stdout:      self.stdout,
         }
+        .into()
     }
 }
 

src/msgs/data_requests/execute_tests.rs

@@ -1,10 +1,10 @@
 use semver::Version;
 use serde_json::json;
 
-use super::{execute::*, ExecuteMsg, PostDataRequestArgs, RevealBody};
 #[cfg(feature = "cosmwasm")]
-use super::{Bytes, U128};
-use crate::msgs::assert_json_ok;
+use super::Bytes;
+use super::{execute::*, ExecuteMsg, PostDataRequestArgs, RevealBody};
+use crate::msgs::*;
 
 #[test]
 fn json_commit_result() {
@@ -23,7 +23,10 @@ fn json_commit_result() {
         proof:      "proof".to_string(),
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
@@ -43,15 +46,9 @@ fn json_post_request() {
     #[cfg(feature = "cosmwasm")]
     let consensus_filter: Bytes = "consensus_filter".as_bytes().into();
 
-    #[cfg(not(feature = "cosmwasm"))]
-    let gas_price = 100;
-    #[cfg(feature = "cosmwasm")]
-    let gas_price: U128 = 100u128.into();
+    let gas_price = 100u128.into();
 
-    #[cfg(not(feature = "cosmwasm"))]
-    let gas_limit = 100;
-    #[cfg(feature = "cosmwasm")]
-    let gas_limit: U128 = 100u128.into();
+    let gas_limit = 100u128.into();
 
     #[cfg(not(feature = "cosmwasm"))]
     let memo = "memo".to_string();
@@ -104,15 +101,15 @@ fn json_post_request() {
         payback_address,
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
 fn json_reveal_result() {
-    #[cfg(not(feature = "cosmwasm"))]
-    let gas_used = 100;
-    #[cfg(feature = "cosmwasm")]
-    let gas_used: U128 = 100u128.into();
+    let gas_used = 100u128.into();
 
     #[cfg(not(feature = "cosmwasm"))]
     let reveal = "reveal".to_string();
@@ -149,5 +146,8 @@ fn json_reveal_result() {
         stdout: vec!["some-output".to_string()],
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }

src/msgs/data_requests/mod.rs

@@ -16,4 +16,5 @@ mod test {
     mod execute_tests;
     mod query_tests;
     mod sudo_tests;
+    mod types_tests;
 }

src/msgs/data_requests/query_tests.rs

@@ -1,7 +1,7 @@
 use serde_json::json;
 
 use super::{data_requests::DataRequestStatus, query::QueryMsg as DrQueryMsg, QueryMsg};
-use crate::msgs::assert_json_ok;
+use crate::msgs::*;
 
 #[test]
 fn json_get_data_request() {
@@ -14,7 +14,10 @@ fn json_get_data_request() {
         dr_id: "dr_id".to_string(),
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
@@ -30,7 +33,10 @@ fn json_get_data_request_commitment() {
         public_key: "public_key".to_string(),
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
@@ -44,7 +50,10 @@ fn json_get_data_request_commitments() {
         dr_id: "dr_id".to_string(),
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
@@ -60,21 +69,27 @@ fn json_get_data_request_reveal() {
         public_key: "public_key".to_string(),
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
 fn json_get_data_request_reveals() {
     let expected_json = json!({
-            "get_data_request_reveals": {
-                    "dr_id": "dr_id",
-            }
+      "get_data_request_reveals": {
+        "dr_id": "dr_id",
+      }
     });
     let msg: QueryMsg = DrQueryMsg::GetDataRequestReveals {
         dr_id: "dr_id".to_string(),
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
@@ -88,7 +103,10 @@ fn json_get_data_result() {
         dr_id: "dr_id".to_string(),
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }
 
 #[test]
@@ -106,5 +124,8 @@ fn json_get_data_requests_by_status() {
         limit:  10,
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }

src/msgs/data_requests/sudo_tests.rs

@@ -1,10 +1,10 @@
 use semver::Version;
 use serde_json::json;
 
-use super::{sudo::*, DataResult, SudoMsg};
 #[cfg(feature = "cosmwasm")]
-use super::{Bytes, U128};
-use crate::msgs::assert_json_ok;
+use super::Bytes;
+use super::{sudo::*, DataResult, SudoMsg};
+use crate::msgs::*;
 
 #[test]
 fn json_post_result() {
@@ -13,10 +13,7 @@ fn json_post_result() {
     #[cfg(feature = "cosmwasm")]
     let result_bytes: Bytes = "result".as_bytes().into();
 
-    #[cfg(not(feature = "cosmwasm"))]
-    let gas_used = 100;
-    #[cfg(feature = "cosmwasm")]
-    let gas_used: U128 = 100u128.into();
+    let gas_used = 100u128.into();
 
     #[cfg(not(feature = "cosmwasm"))]
     let seda_payload = "seda_payload".to_string();
@@ -61,5 +58,8 @@ fn json_post_result() {
         exit_code: 0,
     }
     .into();
-    assert_json_ok(msg, expected_json);
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
 }

src/msgs/data_requests/types.rs

@@ -129,7 +129,6 @@ pub struct DataResult {
     /// Block Height at which data request was finalized
     pub block_height: u64,
     /// Gas used by the complete data request execution
-    #[cfg_attr(not(feature = "cosmwasm"), serde(serialize_with = "crate::types::serialize_as_str"))]
     pub gas_used:     U128,
 
     // Fields from Data Request Execution
@@ -197,7 +196,6 @@ impl TryHashSelf for DataResult {
 pub struct RevealBody {
     pub salt:      String,
     pub exit_code: u8,
-    #[cfg_attr(not(feature = "cosmwasm"), serde(serialize_with = "crate::types::serialize_as_str"))]
     pub gas_used:  U128,
     pub reveal:    Bytes,
 }
@@ -235,9 +233,7 @@ pub struct PostDataRequestArgs {
     pub tally_inputs:       Bytes,
     pub replication_factor: u16,
     pub consensus_filter:   Bytes,
-    #[cfg_attr(not(feature = "cosmwasm"), serde(serialize_with = "crate::types::serialize_as_str"))]
     pub gas_price:          U128,
-    #[cfg_attr(not(feature = "cosmwasm"), serde(serialize_with = "crate::types::serialize_as_str"))]
     pub gas_limit:          U128,
     pub memo:               Bytes,
 }