Merge pull request #2263 from CosmWasm/aw/nonzero-tests

Add tests for NonZero types
CosmWasm · Sep 23, 2024 · 5b16205 · 5b16205
2 parents 82f3567 + 6cbf188
commit 5b16205
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/nested-contracts/Cargo.toml b/contracts/nested-contracts/Cargo.toml
@@ -30,9 +30,9 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 [dependencies]
 cosmwasm-schema = "2.1.0"
 cosmwasm-std = { version = "2.1.0", features = [
-  "cosmwasm_1_4",
-  # Enable this if you only deploy to chains that have CosmWasm 2.0 or higher
-  # "cosmwasm_2_0",
+    "cosmwasm_1_4",
+    # Enable this if you only deploy to chains that have CosmWasm 2.0 or higher
+    # "cosmwasm_2_0",
 ] }
 cw-storage-plus = "2.0.0"
 cw2 = "2.0.0"

diff --git a/contracts/nested-contracts/inner-contract/Cargo.toml b/contracts/nested-contracts/inner-contract/Cargo.toml
@@ -30,9 +30,9 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 [dependencies]
 cosmwasm-schema = "2.1.0"
 cosmwasm-std = { version = "2.1.0", features = [
-  "cosmwasm_1_4",
-  # Enable this if you only deploy to chains that have CosmWasm 2.0 or higher
-  # "cosmwasm_2_0",
+    "cosmwasm_1_4",
+    # Enable this if you only deploy to chains that have CosmWasm 2.0 or higher
+    # "cosmwasm_2_0",
 ] }
 cw-storage-plus = "2.0.0"
 cw2 = "2.0.0"

diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml
@@ -86,4 +86,9 @@ chrono = { version = "0.4", default-features = false, features = [
 ] }
 crc32fast = "1.3.2"
 hex-literal = "0.4.1"
+paste = "1.0.15"
+proptest = { version = "1.5.0", default-features = false, features = [
+    "attr-macro",
+    "std",
+] }
 serde_json = "1.0.81"
diff --git a/packages/std/src/serde.rs b/packages/std/src/serde.rs
@@ -70,8 +70,15 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
+    use core::num::{
+        NonZeroI128, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI8, NonZeroU128, NonZeroU16,
+        NonZeroU32, NonZeroU64, NonZeroU8,
+    };
+    use proptest::{prop_assert_eq, property_test};
     use serde::Deserialize;
 
+    use crate::msgpack::{from_msgpack, to_msgpack_vec};
+
     #[derive(Serialize, Deserialize, Debug, PartialEq)]
     #[serde(rename_all = "snake_case")]
     enum SomeMsg {
@@ -182,4 +189,54 @@ mod tests {
             r#"{"release_all":{"image":"foo","amount":42,"time":9007199254740999,"karma":-17}}"#
         );
     }
+
+    macro_rules! test_integer {
+        ($($ty:ty),+$(,)?) => {
+            $(
+                ::paste::paste! {
+                    #[property_test]
+                    fn [<test_ $ty:snake:lower _encoding>](input: $ty) {
+                        let primitive = input.get();
+
+                        // Verify that the serialization is the same as the primitive
+                        let serialized = to_json_string(&input).unwrap();
+                        let serialized_primitive = to_json_string(&primitive).unwrap();
+                        prop_assert_eq!(serialized.as_str(), serialized_primitive.as_str());
+
+                        // Verify that the serialized primitive can be deserialized
+                        let deserialized: $ty = from_json(serialized_primitive).unwrap();
+                        assert_eq!(deserialized, input);
+
+                        // Verify that zero is not allowed
+                        assert!(from_json::<$ty>("0").is_err());
+
+                        // Verify that the msgpack encoding is the same as the primitive
+                        let serialized = to_msgpack_vec(&input).unwrap();
+                        let serialized_primitive = to_msgpack_vec(&primitive).unwrap();
+                        prop_assert_eq!(serialized.as_slice(), serialized_primitive.as_slice());
+
+                        // Verify that the serialized primitive can be deserialized
+                        let deserialized: $ty = from_msgpack(&serialized_primitive).unwrap();
+                        prop_assert_eq!(deserialized, input);
+                    }
+                }
+            )+
+        };
+    }
+
+    test_integer! {
+        NonZeroU8,
+        NonZeroU16,
+        NonZeroU32,
+        NonZeroU64,
+        NonZeroU128,
+    }
+
+    test_integer! {
+        NonZeroI8,
+        NonZeroI16,
+        NonZeroI32,
+        NonZeroI64,
+        NonZeroI128,
+    }
 }