Fix reliance on non-empty NodeInfo::endpoints (#8684)

* Use as_deref instead of .map in Node::client_version

* Fix reliance on non-empty NodeInfo::endpoints
This commit is contained in:
Roman Proskuryakov
2021-04-29 13:37:05 +00:00
committed by GitHub
parent 06670046bc
commit be1dce5618
2 changed files with 6 additions and 4 deletions
+5 -3
View File
@@ -138,13 +138,15 @@ pub struct Node<'a>(&'a NodeInfo);
impl<'a> Node<'a> {
/// Returns the endpoint of an established connection to the peer.
pub fn endpoint(&self) -> &'a ConnectedPoint {
&self.0.endpoints[0] // `endpoints` are non-empty by definition
///
/// Returns `None` if we are disconnected from the node.
pub fn endpoint(&self) -> Option<&'a ConnectedPoint> {
self.0.endpoints.get(0)
}
/// Returns the latest version information we know of.
pub fn client_version(&self) -> Option<&'a str> {
self.0.client_version.as_ref().map(|s| &s[..])
self.0.client_version.as_deref()
}
/// Returns the latest ping time we know of for this node. `None` if we never successfully
+1 -1
View File
@@ -550,7 +550,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
let known_addresses = NetworkBehaviour::addresses_of_peer(swarm.behaviour_mut(), peer_id)
.into_iter().collect();
let endpoint = if let Some(e) = swarm.behaviour_mut().node(peer_id).map(|i| i.endpoint()) {
let endpoint = if let Some(e) = swarm.behaviour_mut().node(peer_id).map(|i| i.endpoint()).flatten() {
e.clone().into()
} else {
error!(target: "sub-libp2p", "Found state inconsistency between custom protocol \