Merge pull request #93 from rustaceanrob/de-11-13

protocol/src/lib.rs

@@ -1291,7 +1291,7 @@ impl AsyncProtocolReader {
 
     /// Consume the protocol reader in exchange for the underlying packet decoder.
     pub fn decoder(self) -> PacketReader {
-        return self.packet_reader;
+        self.packet_reader
     }
 }
 
@@ -1332,7 +1332,7 @@ impl AsyncProtocolWriter {
 
     /// Consume the protocol writer in exchange for the underlying packet encoder.
     pub fn encoder(self) -> PacketWriter {
-        return self.packet_writer;
+        self.packet_writer
     }
 }
 

protocol/src/serde.rs

@@ -19,13 +19,15 @@ pub use bitcoin::p2p::message::{CommandString, NetworkMessage};
 pub enum Error {
     Serialize,
     Deserialize,
+    UnknownShortID(u8),
 }
 
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Error::Serialize => write!(f, "Unable to serialize"),
             Error::Deserialize => write!(f, "Unable to deserialize"),
+            Error::UnknownShortID(b) => write!(f, "Unrecognized short ID when deserializing {b}"),
         }
     }
 }
@@ -36,6 +38,7 @@ impl std::error::Error for Error {
         match self {
             Error::Serialize => None,
             Error::Deserialize => None,
+            Error::UnknownShortID(_) => None,
         }
     }
 }
@@ -283,7 +286,7 @@ pub fn deserialize(buffer: &[u8]) -> Result<NetworkMessage, Error> {
         )),
 
         // Unsupported short ID.
-        _ => Err(Error::Deserialize),
+        unknown => Err(Error::UnknownShortID(unknown)),
     }
 }