aquatic_http: serialize info_hash and peer_id properly

aquatic_http/src/lib/protocol/mod.rs

@@ -14,6 +14,7 @@ use serde_helpers::*;
 pub struct PeerId(
     #[serde(
         deserialize_with = "deserialize_20_bytes",
+        serialize_with = "serialize_20_bytes",
     )]
     pub [u8; 20]
 );
@@ -24,11 +25,13 @@ pub struct PeerId(
 pub struct InfoHash(
     #[serde(
         deserialize_with = "deserialize_20_bytes",
+        serialize_with = "serialize_20_bytes",
     )]
     pub [u8; 20]
 );
 
 
+
 #[derive(Clone, Copy, Debug, Serialize)]
 pub struct ResponsePeer {
     pub ip_address: IpAddr,
@@ -225,6 +228,13 @@ pub enum Response {
 
 impl Response {
     pub fn to_bytes(self) -> Vec<u8> {
-        bendy::serde::to_bytes(&self).unwrap()
+        match bendy::serde::to_bytes(&self){
+            Ok(bytes) => bytes,
+            Err(err) => {
+                log::error!("error encoding response: {}", err);
+
+                Vec::new()
+            }
+        }
     }
 }

aquatic_http/src/lib/protocol/serde_helpers.rs

@@ -91,6 +91,15 @@ pub fn deserialize_20_bytes<'de, D>(
 }
 
 
+#[inline]
+pub fn serialize_20_bytes<S>(
+    bytes: &[u8; 20],
+    serializer: S
+) -> Result<S::Ok, S::Error> where S: Serializer {
+    serializer.serialize_bytes(bytes)
+}
+
+
 pub struct InfoHashVecVisitor;
 
 
@@ -162,12 +171,10 @@ pub fn serialize_response_peers_compact<S>(
                 bytes.extend_from_slice(&peer.port.to_be_bytes())
             },
             IpAddr::V6(_) => {
-                continue
+                continue;
             }
         }
     }
 
-    let text: String = bytes.into_iter().map(|byte| byte as char).collect();
+    serializer.serialize_bytes(&bytes)
-
-    serializer.serialize_str(&text)
 }