From 32458d743f757da3193717fe5554f490703640c0 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 1 Sep 2022 20:37:38 -0500 Subject: fix bad u32::write_into and add tests --- azalea-protocol/src/lib.rs | 38 +++++++++++++++++++--- .../src/packets/login/serverbound_hello_packet.rs | 23 +++++++++++-- 2 files changed, 55 insertions(+), 6 deletions(-) (limited to 'azalea-protocol/src') diff --git a/azalea-protocol/src/lib.rs b/azalea-protocol/src/lib.rs index b1d1a9c4..f5922e27 100755 --- a/azalea-protocol/src/lib.rs +++ b/azalea-protocol/src/lib.rs @@ -50,9 +50,39 @@ pub async fn connect(address: ServerAddress) -> Result<(), Box(&mut stream, None, &mut None) + .await + .unwrap(); } } diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs index 7644beae..a6443737 100755 --- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs +++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs @@ -2,16 +2,35 @@ use azalea_buf::McBuf; use packet_macros::ServerboundLoginPacket; use uuid::Uuid; -#[derive(Clone, Debug, McBuf, ServerboundLoginPacket)] +#[derive(Clone, Debug, ServerboundLoginPacket, McBuf, PartialEq)] pub struct ServerboundHelloPacket { pub username: String, pub public_key: Option, pub profile_id: Option, } -#[derive(Clone, Debug, McBuf)] +#[derive(Clone, Debug, McBuf, PartialEq)] pub struct ProfilePublicKeyData { pub expires_at: u64, pub key: Vec, pub key_signature: Vec, } + +#[cfg(test)] +mod tests { + use super::*; + use azalea_buf::{McBufReadable, McBufWritable}; + + #[test] + fn test_read_write() { + let packet = ServerboundHelloPacket { + username: "test".to_string(), + public_key: None, + profile_id: Some(Uuid::from_u128(0)), + }; + let mut buf = Vec::new(); + packet.write_into(&mut buf).unwrap(); + let packet2 = ServerboundHelloPacket::read_from(&mut buf.as_slice()).unwrap(); + assert_eq!(packet, packet2); + } +} -- cgit v1.2.3