Saving

crates/peer_binary_protocol/src/extended/handshake.rs

@@ -59,6 +59,13 @@ impl<ByteBuf: Eq + std::hash::Hash> ExtendedHandshake<ByteBuf> {
             }
         })
     }
+
+    pub fn ut_metadata(&self) -> Option<u8>
+    where
+        ByteBuf: AsRef<[u8]>,
+    {
+        self.get_msgid(b"ut_metadata")
+    }
 }
 
 impl<ByteBuf> CloneToOwned for ExtendedHandshake<ByteBuf>

crates/peer_binary_protocol/src/extended/mod.rs

@@ -1,7 +1,6 @@
 use bencode::bencode_serialize_to_writer;
 use bencode::from_bytes;
 use bencode::BencodeValue;
-use buffers::ByteString;
 use clone_to_owned::CloneToOwned;
 use serde::{Deserialize, Serialize};
 
@@ -41,7 +40,7 @@ impl<'a, ByteBuf: 'a + std::hash::Hash + Eq + Serialize> ExtendedMessage<ByteBuf
     pub fn serialize(
         &self,
         out: &mut Vec<u8>,
-        extended_handshake: Option<&ExtendedHandshake<ByteString>>,
+        extended_handshake_ut_metadata: &dyn Fn() -> Option<u8>,
     ) -> anyhow::Result<()>
     where
         ByteBuf: AsRef<[u8]>,
@@ -56,12 +55,9 @@ impl<'a, ByteBuf: 'a + std::hash::Hash + Eq + Serialize> ExtendedMessage<ByteBuf
                 bencode_serialize_to_writer(h, out)?;
             }
             ExtendedMessage::UtMetadata(u) => {
-                let h = extended_handshake.ok_or_else(|| {
+                let emsg_id = extended_handshake_ut_metadata().ok_or_else(|| {
                     anyhow::anyhow!("need peer's handshake to serialize ut_metadata")
                 })?;
-                let emsg_id = h
-                    .get_msgid(b"ut_metadata")
-                    .ok_or_else(|| anyhow::anyhow!("peer doesn't support ut_metadata"))?;
                 out.push(emsg_id);
                 u.serialize(out);
             }

crates/peer_binary_protocol/src/lib.rs

@@ -11,7 +11,7 @@ use clone_to_owned::CloneToOwned;
 use librqbit_core::{constants::CHUNK_SIZE, id20::Id20, lengths::ChunkInfo};
 use serde::{Deserialize, Serialize};
 
-use self::extended::{handshake::ExtendedHandshake, ExtendedMessage};
+use self::extended::ExtendedMessage;
 
 const INTEGER_LEN: usize = 4;
 const MSGID_LEN: usize = 1;
@@ -258,7 +258,7 @@ where
     pub fn serialize(
         &self,
         out: &mut Vec<u8>,
-        peer_extended_handshake: Option<&ExtendedHandshake<ByteString>>,
+        extended_handshake_ut_metadata: &dyn Fn() -> Option<u8>,
     ) -> anyhow::Result<usize> {
         let (lp, msg_id) = self.len_prefix_and_msg_id();
 
@@ -308,7 +308,7 @@ where
                 Ok(msg_len)
             }
             Message::Extended(e) => {
-                e.serialize(out, peer_extended_handshake)?;
+                e.serialize(out, extended_handshake_ut_metadata)?;
                 let msg_size = out.len();
                 // no fucking idea why +1, but I tweaked that for it all to match up
                 // with real messages.
@@ -576,6 +576,8 @@ impl Request {
 
 #[cfg(test)]
 mod tests {
+    use crate::extended::handshake::ExtendedHandshake;
+
     use super::*;
     #[test]
     fn test_handshake_serialize() {
@@ -594,7 +596,7 @@ mod tests {
     fn test_extended_serialize() {
         let msg = Message::Extended(ExtendedMessage::Handshake(ExtendedHandshake::new()));
         let mut out = Vec::new();
-        msg.serialize(&mut out, None).unwrap();
+        msg.serialize(&mut out, &|| None).unwrap();
         dbg!(out);
     }
 
@@ -610,7 +612,7 @@ mod tests {
         let (msg, size) = MessageBorrowed::deserialize(&buf).unwrap();
         assert_eq!(size, buf.len());
         let mut write_buf = Vec::new();
-        msg.serialize(&mut write_buf, None).unwrap();
+        msg.serialize(&mut write_buf, &|| None).unwrap();
         if buf != write_buf {
             {
                 use std::io::Write;