remove decode macro

this  came from hypercore but has been removed

Author: cowlicks

src/schema.rs

@@ -1,10 +1,9 @@
 use compact_encoding::{
-    map_encode, sum_encoded_size, take_array, take_array_mut, write_array, write_slice,
+    map_decode, map_encode, sum_encoded_size, take_array, take_array_mut, write_array, write_slice,
     CompactEncoding, EncodingError,
 };
 use hypercore::{
-    decode, DataBlock, DataHash, DataSeek, DataUpgrade, Proof, RequestBlock, RequestSeek,
-    RequestUpgrade,
+    DataBlock, DataHash, DataSeek, DataUpgrade, Proof, RequestBlock, RequestSeek, RequestUpgrade,
 };
 use tracing::instrument;
 
@@ -50,9 +49,8 @@ impl CompactEncoding for Open {
     where
         Self: Sized,
     {
-        let (channel, rest) = u64::decode(buffer)?;
-        let (protocol, rest) = String::decode(rest)?;
-        let (discovery_key, rest) = <Vec<u8>>::decode(rest)?;
+        let ((channel, protocol, discovery_key), rest) =
+            map_decode!(buffer, [u64, String, Vec<u8>]);
         // TODO this is a CLEAR bug it assumes nothing is encoded after this message
         let (capability, rest) = if !rest.is_empty() {
             let (_, rest) = take_array::<1>(rest)?;
@@ -62,7 +60,7 @@ impl CompactEncoding for Open {
             (None, rest)
         };
         Ok((
-            Open {
+            Self {
                 channel,
                 protocol,
                 discovery_key,
@@ -93,7 +91,8 @@ impl CompactEncoding for Close {
     where
         Self: Sized,
     {
-        decode!(Close, buffer, {channel: u64})
+        let (channel, rest) = u64::decode(buffer)?;
+        Ok((Self { channel }, rest))
     }
 }
 
@@ -138,10 +137,7 @@ impl CompactEncoding for Synchronize {
         Self: Sized,
     {
         let ([flags], rest) = take_array::<1>(buffer)?;
-        dbg!(flags);
-        let (fork, rest) = u64::decode(rest)?;
-        let (length, rest) = u64::decode(rest)?;
-        let (remote_length, rest) = u64::decode(rest)?;
+        let ((fork, length, remote_length), rest) = map_decode!(rest, [u64, u64, u64]);
         let can_upgrade = flags & 1 != 0;
         let uploading = flags & 2 != 0;
         let downloading = flags & 4 != 0;
@@ -234,8 +230,7 @@ impl CompactEncoding for Request {
         Self: Sized,
     {
         let ([flags], rest) = take_array::<1>(buffer)?;
-        let (id, rest) = u64::decode(rest)?;
-        let (fork, rest) = u64::decode(rest)?;
+        let ((id, fork), rest) = map_decode!(rest, [u64, u64]);
 
         let (block, rest) = maybe_decode!(flags & 1 != 0, RequestBlock, rest);
         let (hash, rest) = maybe_decode!(flags & 2 != 0, RequestBlock, rest);
@@ -345,8 +340,7 @@ impl CompactEncoding for Data {
         Self: Sized,
     {
         let ([flags], rest) = take_array::<1>(buffer)?;
-        let (request, rest) = u64::decode(rest)?;
-        let (fork, rest) = u64::decode(rest)?;
+        let ((request, fork), rest) = map_decode!(rest, [u64, u64]);
         let (block, rest) = maybe_decode!(flags & 1 != 0, DataBlock, rest);
         let (hash, rest) = maybe_decode!(flags & 2 != 0, DataHash, rest);
         let (seek, rest) = maybe_decode!(flags & 4 != 0, DataSeek, rest);
@@ -398,7 +392,8 @@ impl CompactEncoding for NoData {
     where
         Self: Sized,
     {
-        decode!(NoData, buffer, { request: u64 })
+        let (request, rest) = u64::decode(buffer)?;
+        Ok((Self { request }, rest))
     }
 }
 
@@ -424,7 +419,8 @@ impl CompactEncoding for Want {
     where
         Self: Sized,
     {
-        decode!(Self, buffer, { start: u64, length: u64 })
+        let ((start, length), rest) = map_decode!(buffer, [u64, u64]);
+        Ok((Self { start, length }, rest))
     }
 }
 
@@ -450,7 +446,8 @@ impl CompactEncoding for Unwant {
     where
         Self: Sized,
     {
-        decode!(Self, buffer, { start: u64, length: u64 })
+        let ((start, length), rest) = map_decode!(buffer, [u64, u64]);
+        Ok((Self { start, length }, rest))
     }
 }
 
@@ -475,7 +472,8 @@ impl CompactEncoding for Bitfield {
     where
         Self: Sized,
     {
-        decode!(Self, buffer, { start: u64, bitfield: Vec<u32> })
+        let ((start, bitfield), rest) = map_decode!(buffer, [u64, Vec<u32>]);
+        Ok((Self { start, bitfield }, rest))
     }
 }
 
@@ -556,6 +554,7 @@ impl CompactEncoding for Extension {
     where
         Self: Sized,
     {
-        decode!(Self, buffer, { name: String, message: Vec<u8> })
+        let ((name, message), rest) = map_decode!(buffer, [String, Vec<u8>]);
+        Ok((Self { name, message }, rest))
     }
 }