Skip to content

ts_tunnel: convert EndpointState::new to EndpointState::from #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danderson merged 1 commit into from
Aug 19, 2026
+7 −7
Merged

ts_tunnel: convert EndpointState::new to EndpointState::from #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ts_tunnel/src/endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ pub struct EndpointState {
pub scheduler: Scheduler<Event>,
}

impl EndpointState {
pub fn new(my_key: NodeKeyPair) -> Self {
impl From<NodeKeyPair> for EndpointState {
fn from(my_key: NodeKeyPair) -> Self {
let my_cookie = MACReceiver::new(&my_key.public);
Self {
my_key,
Expand All @@ -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(),
}
}
Expand Down
8 changes: 4 additions & 4 deletions ts_tunnel/src/handshake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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())
Expand Down Expand Up @@ -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());
Expand All @@ -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
Expand Down