Consume supported protocols in identify

Author: thomaseizinger

protocols/identify/src/behaviour.rs

@@ -323,7 +323,7 @@ impl NetworkBehaviour for Behaviour {
     fn poll(
         &mut self,
         _cx: &mut Context<'_>,
-        params: &mut impl PollParameters,
+        _: &mut impl PollParameters,
     ) -> Poll<ToSwarm<Self::OutEvent, THandlerInEvent<Self>>> {
         if let Some(event) = self.events.pop_front() {
             return Poll::Ready(event);
@@ -344,7 +344,6 @@ impl NetworkBehaviour for Behaviour {
                         .chain(self.external_addresses.iter())
                         .cloned()
                         .collect(),
-                    supported_protocols: supported_protocols(params),
                     protocol: Protocol::Push,
                 },
             }),
@@ -361,7 +360,6 @@ impl NetworkBehaviour for Behaviour {
                         .chain(self.external_addresses.iter())
                         .cloned()
                         .collect(),
-                    supported_protocols: supported_protocols(params),
                     protocol: Protocol::Identify(connection_id),
                 },
             }),
@@ -488,15 +486,6 @@ pub enum Event {
     },
 }
 
-fn supported_protocols(params: &impl PollParameters) -> Vec<String> {
-    // The protocol names can be bytes, but the identify protocol except UTF-8 strings.
-    // There's not much we can do to solve this conflict except strip non-UTF-8 characters.
-    params
-        .supported_protocols()
-        .map(|p| String::from_utf8_lossy(&p).to_string())
-        .collect()
-}
-
 /// If there is a given peer_id in the multiaddr, make sure it is the same as
 /// the given peer_id. If there is no peer_id for the peer in the mutiaddr, this returns true.
 fn multiaddr_matches_peer_id(addr: &Multiaddr, peer_id: &PeerId) -> bool {

protocols/identify/src/handler.rs

@@ -32,6 +32,7 @@ use libp2p_identity::PeerId;
 use libp2p_identity::PublicKey;
 use libp2p_swarm::handler::{
     ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
+    ProtocolsChange,
 };
 use libp2p_swarm::{
     ConnectionHandler, ConnectionHandlerEvent, ConnectionHandlerUpgrErr, KeepAlive,
@@ -83,6 +84,8 @@ pub struct Handler {
 
     /// Address observed by or for the remote.
     observed_addr: Multiaddr,
+
+    local_supported_protocols: Vec<String>,
 }
 
 /// An event from `Behaviour` with the information requested by the `Handler`.
@@ -91,9 +94,6 @@ pub struct InEvent {
     /// The addresses that the peer is listening on.
     pub listen_addrs: Vec<Multiaddr>,
 
-    /// The list of protocols supported by the peer, e.g. `/ipfs/ping/1.0.0`.
-    pub supported_protocols: Vec<String>,
-
     /// The protocol w.r.t. the information requested.
     pub protocol: Protocol,
 }
@@ -138,6 +138,7 @@ impl Handler {
             protocol_version,
             agent_version,
             observed_addr,
+            local_supported_protocols: vec![],
         }
     }
 
@@ -238,7 +239,6 @@ impl ConnectionHandler for Handler {
         &mut self,
         InEvent {
             listen_addrs,
-            supported_protocols,
             protocol,
         }: Self::InEvent,
     ) {
@@ -247,7 +247,7 @@ impl ConnectionHandler for Handler {
             protocol_version: self.protocol_version.clone(),
             agent_version: self.agent_version.clone(),
             listen_addrs,
-            protocols: supported_protocols,
+            protocols: self.local_supported_protocols.clone(),
             observed_addr: self.observed_addr.clone(),
         };
 
@@ -344,9 +344,10 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {
                 self.on_dial_upgrade_error(dial_upgrade_error)
             }
-            ConnectionEvent::AddressChange(_)
-            | ConnectionEvent::ListenUpgradeError(_)
-            | ConnectionEvent::LocalProtocolsChange(_) => {}
+            ConnectionEvent::AddressChange(_) | ConnectionEvent::ListenUpgradeError(_) => {}
+            ConnectionEvent::LocalProtocolsChange(ProtocolsChange { protocols }) => {
+                self.local_supported_protocols = protocols.to_vec();
+            }
             ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }