From 0b508986f254686058af25f3886a7bd7c2811f0e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 19 Aug 2026 10:08:57 -0700 Subject: [PATCH] ts_tunnel: convert EndpointState::new to EndpointState::from Updates #339 Signed-off-by: David Anderson Change-Id: I028a9b51a25865e3322cc42eca8c49d46a6a6964 --- ts_tunnel/src/endpoint.rs | 6 +++--- ts_tunnel/src/handshake.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ts_tunnel/src/endpoint.rs b/ts_tunnel/src/endpoint.rs index 8ed539ef..32533d42 100644 --- a/ts_tunnel/src/endpoint.rs +++ b/ts_tunnel/src/endpoint.rs @@ -311,8 +311,8 @@ pub struct EndpointState { pub scheduler: Scheduler, } -impl EndpointState { - pub fn new(my_key: NodeKeyPair) -> Self { +impl From for EndpointState { + fn from(my_key: NodeKeyPair) -> Self { let my_cookie = MACReceiver::new(&my_key.public); Self { my_key, @@ -328,7 +328,7 @@ impl Endpoint { /// Construct a new endpoint with the given keypair. pub fn new(my_key: NodeKeyPair) -> Self { Self { - state: EndpointState::new(my_key), + state: my_key.into(), peers: HashMap::new(), } } diff --git a/ts_tunnel/src/handshake.rs b/ts_tunnel/src/handshake.rs index 1016e569..f43a4ffd 100644 --- a/ts_tunnel/src/handshake.rs +++ b/ts_tunnel/src/handshake.rs @@ -358,7 +358,7 @@ mod tests { let psk = rand::random(); // Peer A sends a handshake initiation... - let mut a_state = EndpointState::new(a_static.clone()); + let mut a_state = EndpointState::from(a_static.clone()); let mut a_handshake = Handshake::new(&b_static.public); let a_peer = PeerConfig::new(PeerId(1), b_static.public, psk); let init_pkt = a_handshake.initiate(&mut a_state, &a_peer, Instant::now()); @@ -368,7 +368,7 @@ mod tests { .expect("B should parse the initiation message"); let mut b_handshake = Handshake::new(&a_state.my_key.public); - let mut b_state = EndpointState::new(b_static); + let mut b_state = EndpointState::from(b_static); let b_peer = PeerConfig::new(PeerId(2), a_static.public, psk); let mut response_pkt = b_handshake .respond(init_pkt, &mut b_state, &b_peer, Instant::now()) @@ -404,7 +404,7 @@ mod tests { let psk = rand::random(); // A sends a handshake - let mut a_state = EndpointState::new(a_static.clone()); + let mut a_state = EndpointState::from(a_static.clone()); let mut a_handshake = Handshake::new(&b_static.public); let a_peer = PeerConfig::new(PeerId(0), b_static.public, psk); let init_pkt = a_handshake.initiate(&mut a_state, &a_peer, Instant::now()); @@ -414,7 +414,7 @@ mod tests { let init_pkt = ReceivedHandshake::new(init_pkt, &b_static, &b_mac_recv) .expect("B should parse the initiation message"); let mut b_handshake = Handshake::new(&a_static.public); - let mut b_state = EndpointState::new(b_static); + let mut b_state = EndpointState::from(b_static); let b_peer = PeerConfig::new(PeerId(2), a_static.public, psk); let mut response_pkt = b_handshake