diff --git a/src/lib.rs b/src/lib.rs index 9862795..23a2ce2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -41,8 +41,6 @@ pub struct Packet { impl Packet { /// create a new `Packet` - /// - /// should not be used when receiving data over a stream pub fn new(kind: PacketKind, contents: Vec) -> Packet { let checksum = digest::digest(&digest::SHA256, &contents).as_ref().to_vec(); Packet { @@ -52,17 +50,6 @@ impl Packet { } } - /// creates a new `Packet` from data received over a stream - /// - /// should not be used when creating a fresh `Packet` - pub fn from_network(kind: PacketKind, contents: Vec, checksum: Vec) -> Packet { - Packet { - kind, - contents, - checksum, - } - } - fn to_network_packet(&self) -> NetworkPacket { let mut contents: Vec = Vec::new(); @@ -144,7 +131,7 @@ where return Ok(None); } - let packet_kind = PacketKind::from_u8(info_buf[0]).unwrap(); + let kind = PacketKind::from_u8(info_buf[0]).unwrap(); let length = u32::from_le_bytes(info_buf[1..9].try_into().unwrap()) as usize; let mut checksum: Vec = vec![0; 32]; @@ -153,7 +140,11 @@ where let mut contents: Vec = vec![0; length]; stream.read(&mut contents).await?; - let packet = Packet::from_network(packet_kind, contents, checksum); + let packet = Packet { + kind, + contents, + checksum, + }; packet.verify_integrity()?; Ok(Some(packet))