binary types: compact serialization

Author: uint

packages/std/src/binary.rs

@@ -211,7 +211,7 @@ impl Serialize for Binary {
         if serializer.is_human_readable() {
             serializer.serialize_str(&self.to_base64())
         } else {
-            panic!("Binary is only intended to be used with JSON serialization for now. If you are hitting this panic please open an issue at https://github.com/CosmWasm/cosmwasm describing your use case.")
+            serializer.serialize_bytes(&self.0)
         }
     }
 }
@@ -225,7 +225,7 @@ impl<'de> Deserialize<'de> for Binary {
         if deserializer.is_human_readable() {
             deserializer.deserialize_str(Base64Visitor)
         } else {
-            panic!("Binary is only intended to be used with JSON serialization for now. If you are hitting this panic please open an issue at https://github.com/CosmWasm/cosmwasm describing your use case.")
+            deserializer.deserialize_bytes(BytesVisitor)
         }
     }
 }
@@ -250,6 +250,23 @@ impl<'de> de::Visitor<'de> for Base64Visitor {
     }
 }
 
+struct BytesVisitor;
+
+impl<'de> de::Visitor<'de> for BytesVisitor {
+    type Value = Binary;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("byte array")
+    }
+
+    fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+    where
+        E: de::Error,
+    {
+        Ok(Binary(v.to_vec()))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

packages/std/src/hex_binary.rs

@@ -214,7 +214,7 @@ impl Serialize for HexBinary {
         if serializer.is_human_readable() {
             serializer.serialize_str(&self.to_hex())
         } else {
-            panic!("HexBinary is only intended to be used with JSON serialization for now. If you are hitting this panic please open an issue at https://github.com/CosmWasm/cosmwasm describing your use case.")
+            serializer.serialize_bytes(&self.0)
         }
     }
 }
@@ -228,7 +228,7 @@ impl<'de> Deserialize<'de> for HexBinary {
         if deserializer.is_human_readable() {
             deserializer.deserialize_str(HexVisitor)
         } else {
-            panic!("HexBinary is only intended to be used with JSON serialization for now. If you are hitting this panic please open an issue at https://github.com/CosmWasm/cosmwasm describing your use case.")
+            deserializer.deserialize_bytes(BytesVisitor)
         }
     }
 }
@@ -253,6 +253,23 @@ impl<'de> de::Visitor<'de> for HexVisitor {
     }
 }
 
+struct BytesVisitor;
+
+impl<'de> de::Visitor<'de> for BytesVisitor {
+    type Value = HexBinary;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("byte array")
+    }
+
+    fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+    where
+        E: de::Error,
+    {
+        Ok(HexBinary(v.to_vec()))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;