From 25c982cd8c06ef1df0b785d7684bca7651d0bba8 Mon Sep 17 00:00:00 2001 From: Slack Coder Date: Sat, 29 Oct 2022 19:33:42 -0500 Subject: [PATCH] node: use method to access session's Node ID Make accessing an important session value, the Node ID, as a method to Session. Signed-off-by: Slack Coder --- radicle-node/src/service.rs | 8 +------- radicle-node/src/service/session.rs | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/radicle-node/src/service.rs b/radicle-node/src/service.rs index 3df70402..5fe1fafe 100644 --- a/radicle-node/src/service.rs +++ b/radicle-node/src/service.rs @@ -1126,13 +1126,7 @@ impl Sessions { } pub fn by_id(&self, id: &NodeId) -> Option<&Session> { - self.0.values().find(|p| { - if let session::State::Negotiated { id: _id, .. } = &p.state { - _id == id - } else { - false - } - }) + self.0.values().find(|p| p.node_id() == Some(*id)) } /// Iterator over fully negotiated peers. diff --git a/radicle-node/src/service/session.rs b/radicle-node/src/service/session.rs index 20ce027d..41d27663 100644 --- a/radicle-node/src/service/session.rs +++ b/radicle-node/src/service/session.rs @@ -122,4 +122,11 @@ impl Session { } Ok(()) } + + pub fn node_id(&self) -> Option { + if let State::Negotiated { id, .. } = &self.state { + return Some(*id); + } + None + } }