refactor(swarm)!: refactor ListenUpgradeError and DialUpgradeError

protocols/identify/CHANGELOG.md

@@ -5,9 +5,12 @@
 - Move I/O from `Behaviour` to `Handler`. Handle `Behaviour`'s Identify and Push requests independently by incoming order,
   previously Push requests were prioritized. see [PR 3208].
 
-- Update to `libp2p-swarm` `v0.42.0`.
+- Update to `libp2p-swarm` `v0.42.0`. Update to the `libp2p_swarm::handler::ConnectionEvent` `DialTimeout`
+  introduction and consequential changes. With that introduce `Event::Timeout`. See [PR 3307].
+
 
 [PR 3208]: https://github.com/libp2p/rust-libp2p/pull/3208
+[PR 3307]: https://github.com/libp2p/rust-libp2p/pull/3307
 
 # 0.41.1
 

protocols/identify/src/behaviour.rs

@@ -25,9 +25,9 @@ use libp2p_core::{
 };
 use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm};
 use libp2p_swarm::{
-    dial_opts::DialOpts, AddressScore, ConnectionHandler, ConnectionHandlerUpgrErr, DialError,
-    ExternalAddresses, IntoConnectionHandler, ListenAddresses, NetworkBehaviour,
-    NetworkBehaviourAction, NotifyHandler, PollParameters,
+    dial_opts::DialOpts, AddressScore, ConnectionHandler, DialError, ExternalAddresses,
+    IntoConnectionHandler, ListenAddresses, NetworkBehaviour, NetworkBehaviourAction,
+    NotifyHandler, PollParameters,
 };
 use lru::LruCache;
 use std::num::NonZeroUsize;
@@ -303,6 +303,9 @@ impl NetworkBehaviour for Behaviour {
                         error,
                     }));
             }
+            handler::Event::IdentificationTimedout => self
+                .events
+                .push_back(NetworkBehaviourAction::GenerateEvent(Event::Timeout)),
         }
     }
 
@@ -459,8 +462,11 @@ pub enum Event {
         /// The peer with whom the error originated.
         peer_id: PeerId,
         /// The error that occurred.
-        error: ConnectionHandlerUpgrErr<UpgradeError>,
+        error: libp2p_core::UpgradeError<UpgradeError>,
     },
+
+    /// Timeout expired while attempting to identify the remote.
+    Timeout,
 }
 
 fn supported_protocols(params: &impl PollParameters) -> Vec<String> {

protocols/identify/src/handler.rs

@@ -32,8 +32,8 @@ use libp2p_swarm::handler::{
     ConnectionEvent, DialUpgradeError, FullyNegotiatedInbound, FullyNegotiatedOutbound,
 };
 use libp2p_swarm::{
-    ConnectionHandler, ConnectionHandlerEvent, ConnectionHandlerUpgrErr, IntoConnectionHandler,
-    KeepAlive, NegotiatedSubstream, SubstreamProtocol,
+    ConnectionHandler, ConnectionHandlerEvent, IntoConnectionHandler, KeepAlive,
+    NegotiatedSubstream, SubstreamProtocol,
 };
 use log::warn;
 use smallvec::SmallVec;
@@ -161,7 +161,9 @@ pub enum Event {
     /// We received a request for identification.
     Identify,
     /// Failed to identify the remote, or to reply to an identification request.
-    IdentificationError(ConnectionHandlerUpgrErr<UpgradeError>),
+    IdentificationError(libp2p_core::UpgradeError<UpgradeError>),
+    /// Identification Dial timedout.
+    IdentificationTimedout,
 }
 
 impl Handler {
@@ -257,11 +259,11 @@ impl Handler {
     ) {
         use libp2p_core::upgrade::UpgradeError;
 
-        let err = err.map_upgrade_err(|e| match e {
+        let err = match err {
             UpgradeError::Select(e) => UpgradeError::Select(e),
             UpgradeError::Apply(EitherError::A(ioe)) => UpgradeError::Apply(ioe),
             UpgradeError::Apply(EitherError::B(ioe)) => UpgradeError::Apply(ioe),
-        });
+        };
         self.events
             .push(ConnectionHandlerEvent::Custom(Event::IdentificationError(
                 err,
@@ -370,9 +372,7 @@ impl ConnectionHandler for Handler {
                 Event::Identification(peer_id),
             )),
             Poll::Ready(Some(Err(err))) => Poll::Ready(ConnectionHandlerEvent::Custom(
-                Event::IdentificationError(ConnectionHandlerUpgrErr::Upgrade(
-                    libp2p_core::upgrade::UpgradeError::Apply(err),
-                )),
+                Event::IdentificationError(libp2p_core::upgrade::UpgradeError::Apply(err)),
             )),
             Poll::Ready(None) | Poll::Pending => Poll::Pending,
         }
@@ -397,6 +397,13 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {
                 self.on_dial_upgrade_error(dial_upgrade_error)
             }
+            ConnectionEvent::DialTimeout(_) => {
+                self.events.push(ConnectionHandlerEvent::Custom(
+                    Event::IdentificationTimedout,
+                ));
+                self.keep_alive = KeepAlive::No;
+                self.trigger_next_identify.reset(self.interval);
+            }
             ConnectionEvent::AddressChange(_) | ConnectionEvent::ListenUpgradeError(_) => {}
         }
     }