Use Checksum type in CodeInfoResponse

Author: chipshort

packages/std/src/checksum.rs

@@ -1,5 +1,7 @@
 use core::fmt;
 
+use schemars::JsonSchema;
+use serde::{de, ser, Deserialize, Deserializer, Serialize};
 use sha2::{Digest, Sha256};
 use thiserror::Error;
 
@@ -10,8 +12,8 @@ use crate::{StdError, StdResult};
 ///
 /// This is often referred to as "code ID" in go-cosmwasm, even if code ID
 /// usually refers to an auto-incrementing number.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct Checksum([u8; 32]);
+#[derive(JsonSchema, Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub struct Checksum(#[schemars(with = "String")] [u8; 32]);
 
 impl Checksum {
     pub fn generate(wasm: &[u8]) -> Self {
@@ -50,6 +52,46 @@ impl From<[u8; 32]> for Checksum {
     }
 }
 
+/// Serializes as a hex string
+impl Serialize for Checksum {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: ser::Serializer,
+    {
+        serializer.serialize_str(&self.to_hex())
+    }
+}
+
+/// Deserializes as a hex string
+impl<'de> Deserialize<'de> for Checksum {
+    fn deserialize<D>(deserializer: D) -> Result<Checksum, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_str(ChecksumVisitor)
+    }
+}
+
+struct ChecksumVisitor;
+
+impl<'de> de::Visitor<'de> for ChecksumVisitor {
+    type Value = Checksum;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("valid hex encoded 32 byte checksum")
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: de::Error,
+    {
+        match Checksum::from_hex(v) {
+            Ok(data) => Ok(data),
+            Err(_) => Err(E::custom(format!("invalid checksum: {v}"))),
+        }
+    }
+}
+
 #[derive(Error, Debug)]
 #[error("Checksum not of length 32")]
 pub struct ChecksumError;

packages/std/src/query/wasm.rs

@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::{Addr, Binary, HexBinary};
+use crate::{Addr, Binary, Checksum};
 
 use super::query_response::QueryResponseType;
 
@@ -70,14 +70,14 @@ pub struct CodeInfoResponse {
     /// The address that initially stored the code
     pub creator: Addr,
     /// The hash of the Wasm blob
-    pub checksum: HexBinary,
+    pub checksum: Checksum,
 }
 
 impl_response_constructor!(
     CodeInfoResponse,
     code_id: u64,
     creator: Addr,
-    checksum: HexBinary
+    checksum: Checksum
 );
 
 impl QueryResponseType for CodeInfoResponse {}
@@ -129,12 +129,12 @@ mod tests {
     #[test]
     #[cfg(feature = "cosmwasm_1_2")]
     fn code_info_response_serialization() {
-        use crate::HexBinary;
+        use crate::Checksum;
 
         let response = CodeInfoResponse {
             code_id: 67,
             creator: Addr::unchecked("jane"),
-            checksum: HexBinary::from_hex(
+            checksum: Checksum::from_hex(
                 "f7bb7b18fb01bbf425cf4ed2cd4b7fb26a019a7fc75a4dc87e8a0b768c501f00",
             )
             .unwrap(),

packages/std/src/testing/mock.rs

@@ -2234,13 +2234,13 @@ mod tests {
                 }
                 #[cfg(feature = "cosmwasm_1_2")]
                 WasmQuery::CodeInfo { code_id } => {
-                    use crate::{CodeInfoResponse, HexBinary};
+                    use crate::{Checksum, CodeInfoResponse};
                     let code_id = *code_id;
                     if code_id == 4 {
                         let response = CodeInfoResponse {
                             code_id,
                             creator: Addr::unchecked("lalala"),
-                            checksum: HexBinary::from_hex(
+                            checksum: Checksum::from_hex(
                                 "84cf20810fd429caf58898c3210fcb71759a27becddae08dbde8668ea2f4725d",
                             )
                             .unwrap(),