fix wire serialization

Signed-off-by: Dave Huseby <[email protected]>

Author: dhuseby

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "multicid"
-version = "0.1.19"
+version = "1.0.0"
 edition = "2021"
 authors = ["Dave Grantham <[email protected]>"]
 description = "Multicodec compatible content identifier implementation"

src/serde/de.rs

@@ -182,13 +182,8 @@ impl<'de> Deserialize<'de> for Vlad {
         if deserializer.is_human_readable() {
             deserializer.deserialize_struct(vlad::SIGIL.as_str(), FIELDS, VladVisitor)
         } else {
-            let (sigil, nonce, cid): (Codec, Nonce, Cid) = Deserialize::deserialize(deserializer)?;
-
-            if sigil != vlad::SIGIL {
-                return Err(Error::custom("deserialized sigil is not a Vlad sigil"));
-            }
-
-            Ok(Self { nonce, cid })
+            let b: &'de [u8] = Deserialize::deserialize(deserializer)?;
+            Ok(Self::try_from(b).map_err(|e| Error::custom(e.to_string()))?)
         }
     }
 }

src/serde/mod.rs

@@ -381,8 +381,8 @@ mod tests {
             .unwrap();
 
         let v = serde_cbor::to_vec(&vlad).unwrap();
-        //println!("{}", hex::encode(&v));
-        assert_eq!(v, hex::decode("83410782413b582120d15c4fb2911ae1337f102bcaf4c0088d36345b88b243968e834c5ffa179078325844017114405792dad96085b6076b8e4e63b578c90d0336bcaadef4f24704df866149526a1e6d23f89e218ad3f6172a7e26e6e37a3dea728e5f232e41696ad286bcca9201be").unwrap());
+        //println!("serde_cbor vlad: {}", hex::encode(&v));
+        assert_eq!(v, hex::decode("5867073b20d15c4fb2911ae1337f102bcaf4c0088d36345b88b243968e834c5ffa17907832017114405792dad96085b6076b8e4e63b578c90d0336bcaadef4f24704df866149526a1e6d23f89e218ad3f6172a7e26e6e37a3dea728e5f232e41696ad286bcca9201be").unwrap());
         assert_eq!(vlad, serde_cbor::from_slice(&v).unwrap());
     }
 
@@ -468,14 +468,7 @@ mod tests {
         assert_tokens(
             &v.compact(),
             &[
-                Token::Tuple { len: 3 },
-                Token::BorrowedBytes(&[0x7]),
-                Token::Tuple { len: 2 },
-                Token::BorrowedBytes(&[0x3b]),
-                Token::BorrowedBytes(&[0x0]),
-                Token::TupleEnd,
-                Token::BorrowedBytes(&[0x1, 0x0, 0x0, 0x0]),
-                Token::TupleEnd,
+                Token::BorrowedBytes(&[0x07, 0x3b, 0x00, 0x01, 0x00, 0x00, 0x00]),
             ]
         );
     }

src/serde/ser.rs

@@ -53,7 +53,8 @@ impl ser::Serialize for Vlad {
             ss.serialize_field("cid", &self.cid)?;
             ss.end()
         } else {
-            (vlad::SIGIL, self.nonce.clone(), self.cid.clone()).serialize(serializer)
+            let v: Vec<u8> = self.clone().into();
+            serializer.serialize_bytes(v.as_slice())
         }
     }
 }

src/vlad.rs

@@ -202,7 +202,7 @@ mod tests {
     use super::*;
     use crate::cid;
     use multihash::mh;
-    use multikey::{nonce, EncodedMultikey};
+    use multikey::EncodedMultikey;
 
     #[test]
     fn test_default() {