fix serialization bugs in net/message.rs

src/net/message.rs

@@ -18,7 +18,7 @@
 
 use darkfi_serial::{
     async_trait, AsyncDecodable, AsyncEncodable, Decodable, Encodable, SerialDecodable,
-    SerialEncodable, VarInt,
+    SerialEncodable,
 };
 use log::trace;
 use smol::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
@@ -118,17 +118,12 @@ pub async fn read_packet<R: AsyncRead + Unpin + Send + Sized>(stream: &mut R) ->
     }
 
     // The type of the message.
-    let command_len = VarInt::decode_async(stream).await?.0 as usize;
-    let mut cmd = vec![0u8; command_len];
-    stream.read_exact(&mut cmd).await?;
-    let command = String::from_utf8(cmd)?;
+    let command = String::decode_async(stream).await?;
     trace!(target: "net::message", "Read command: {}", command);
 
     // The message-dependent data (see message types)
-    let payload_len = VarInt::decode_async(stream).await?.0 as usize;
-    let mut payload = vec![0u8; payload_len];
-    stream.read_exact(&mut payload).await?;
-    trace!(target: "net::message", "Read payload {} bytes", payload_len);
+    let payload = Vec::<u8>::decode_async(stream).await?;
+    trace!(target: "net::message", "Read payload {} bytes", payload.len());
 
     Ok(Packet { command, payload })
 }
@@ -151,16 +146,11 @@ pub async fn send_packet<W: AsyncWrite + Unpin + Send + Sized>(
     trace!(target: "net::message", "Sent magic");
 
     trace!(target: "net::message", "Sending command...");
-    written += VarInt(packet.command.len() as u64).encode_async(stream).await?;
-    let cmd_ref = packet.command.as_bytes();
-    stream.write_all(cmd_ref).await?;
-    written += cmd_ref.len();
+    written += packet.command.encode_async(stream).await?;
     trace!(target: "net::message", "Sent command: {}", packet.command);
 
     trace!(target: "net::message", "Sending payload...");
-    written += VarInt(packet.payload.len() as u64).encode_async(stream).await?;
-    stream.write_all(&packet.payload).await?;
-    written += packet.payload.len();
+    written += packet.payload.encode_async(stream).await?;
     trace!(target: "net::message", "Sent payload {} bytes", packet.payload.len() as u64);
 
     stream.flush().await?;