Browse Source

refactor(cmzcred_derive): use new bincode api.

Michele Orrù 4 months ago
parent
commit
53d9c5faab
2 changed files with 10 additions and 10 deletions
  1. 7 7
      cmzcred_derive/src/lib.rs
  2. 3 3
      tests/basic.rs

+ 7 - 7
cmzcred_derive/src/lib.rs

@@ -1584,16 +1584,16 @@ fn protocol_macro(
             }
 
             impl TryFrom<&[u8]> for ClientState {
-                type Error = bincode::Error;
+                type Error = bincode::error::Error;
 
                 fn try_from(bytes: &[u8]) -> bincode::Result<ClientState> {
-                    bincode::deserialize::<ClientState>(bytes)
+                    bincode::decode_from_slice::<ClientState>(bytes)
                 }
             }
 
             impl From<&ClientState> for Vec<u8> {
                 fn from(req: &ClientState) -> Vec<u8> {
-                    bincode::serialize(req).unwrap()
+                    bincode::encode_to_vec(req).unwrap();
                 }
             }
 
@@ -1617,7 +1617,7 @@ fn protocol_macro(
             }
 
             impl TryFrom<&[u8]> for Request {
-                type Error = bincode::Error;
+                type Error = bincode::error::Error;
 
                 fn try_from(bytes: &[u8]) -> bincode::Result<Request> {
                     bincode::deserialize::<Request>(bytes)
@@ -1626,7 +1626,7 @@ fn protocol_macro(
 
             impl From<&Request> for Vec<u8> {
                 fn from(req: &Request) -> Vec<u8> {
-                    bincode::serialize(req).unwrap()
+                    bincode::encode_to_vec(req).unwrap()
                 }
             }
 
@@ -1643,7 +1643,7 @@ fn protocol_macro(
             }
 
             impl TryFrom<&[u8]> for Reply {
-                type Error = bincode::Error;
+                type Error = bincode::error::Error;
 
                 fn try_from(bytes: &[u8]) -> bincode::Result<Reply> {
                     bincode::deserialize::<Reply>(bytes)
@@ -1652,7 +1652,7 @@ fn protocol_macro(
 
             impl From<&Reply> for Vec<u8> {
                 fn from(rep: &Reply) -> Vec<u8> {
-                    bincode::serialize(rep).unwrap()
+                    bincode::encode_to_vec(rep).unwrap()
                 }
             }
 

+ 3 - 3
tests/basic.rs

@@ -26,8 +26,8 @@ fn test_basic() {
     let (privkey, pubkey) = Basic::cmz14_gen_keys(&mut rng);
 
     // Serialize and deserialize
-    let privkey_bytes = bincode::serialize(&privkey).unwrap();
-    let pubkey_bytes = bincode::serialize(&pubkey).unwrap();
+    let privkey_bytes = bincode::encode_to_vec(&privkey, bincode::config::standard()).unwrap();
+    let pubkey_bytes = bincode::encode_to_vec(&pubkey, bincode::config::standard()).unwrap();
 
     let privkey_serde = bincode::deserialize::<CMZPrivkey<RistrettoPoint>>(&privkey_bytes).unwrap();
     let pubkey_serde = bincode::deserialize::<CMZPubkey<RistrettoPoint>>(&pubkey_bytes).unwrap();
@@ -37,7 +37,7 @@ fn test_basic() {
 
     let mut basic_cred = Basic::using_privkey(&privkey_serde);
 
-    let basic_cred_bytes = bincode::serialize(&basic_cred).unwrap();
+    let basic_cred_bytes = bincode::encode_to_vec(&basic_cred).unwrap();
 
     println!("{:#?}", basic_cred);