From c05f90e611c9e0e74fbedeff97cf6ca768264d64 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 8 Apr 2024 11:31:41 +0300 Subject: refactor(tvix/nix-compat/wire): express magics as u64 This allows using read_u64, write_u64, which is a bit easier to juggle with. Also, update names to align with the nix codebase, which makes it easier to spot both the constant name as well as the value. Leave the ASCII interpretation as a comment afterwards. Change-Id: I0b9ab187acd22807e2785b0722aa4300dab37c51 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11378 Tested-by: BuildkiteCI Reviewed-by: picnoir picnoir Autosubmit: flokli --- users/picnoir/tvix-daemon/src/main.rs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'users/picnoir/tvix-daemon') diff --git a/users/picnoir/tvix-daemon/src/main.rs b/users/picnoir/tvix-daemon/src/main.rs index 46cb813e3e38..398c8af01fcc 100644 --- a/users/picnoir/tvix-daemon/src/main.rs +++ b/users/picnoir/tvix-daemon/src/main.rs @@ -124,20 +124,17 @@ async fn perform_init_handshake<'a, R: 'a>( where &'a mut R: AsyncReadExt + AsyncWriteExt + Unpin + std::fmt::Debug, { - let mut magic_hello = vec![0; 8]; - conn.read_exact(&mut magic_hello).await?; + let worker_magic_1 = primitive::read_u64(&mut conn).await?; debug!("Hello read"); - if magic_hello != worker_protocol::MAGIC_HELLO { + if worker_magic_1 != worker_protocol::WORKER_MAGIC_1 { Err(anyhow!( "Invalid client hello received: {:?}, expected {:?}", - magic_hello, - worker_protocol::MAGIC_HELLO + worker_magic_1, + worker_protocol::WORKER_MAGIC_1 )) } else { - conn.write_all(&worker_protocol::MAGIC_HELLO_RESPONSE[..]) - .await?; - conn.write_all(&worker_protocol::PROTOCOL_VERSION[..]) - .await?; + primitive::write_u64(&mut conn, worker_protocol::WORKER_MAGIC_2).await?; + primitive::write_u64(&mut conn, worker_protocol::PROTOCOL_VERSION).await?; conn.flush().await?; debug!("Hello responded"); let client_version = primitive::read_u64(&mut conn).await?; @@ -198,12 +195,12 @@ mod integration_tests { #[tokio::test] async fn test_init_handshake() { let mut test_conn = tokio_test::io::Builder::new() - .read(&worker_protocol::MAGIC_HELLO) - .write(&worker_protocol::MAGIC_HELLO_RESPONSE) - .write(&worker_protocol::PROTOCOL_VERSION) + .read(&worker_protocol::WORKER_MAGIC_1.to_le_bytes()) + .write(&worker_protocol::WORKER_MAGIC_2.to_le_bytes()) + .write(&worker_protocol::PROTOCOL_VERSION.to_le_bytes()) // Let's say the client is in sync with the daemon // protocol-wise - .read(&worker_protocol::PROTOCOL_VERSION) + .read(&worker_protocol::PROTOCOL_VERSION.to_le_bytes()) // cpu affinity .read(&vec![0; 8]) // reservespace -- cgit 1.4.1