refactor(dcutr): remove direct::Handler

With recent refactorings in `libp2p-swarm`, there is no more need for `handler::direct` at all.

Resolves libp2p#4013.

Pull-Request: libp2p#4016.

Author: tcoratger

protocols/dcutr/src/behaviour_impl.rs

@@ -70,7 +70,7 @@ pub enum Error {
 
 pub struct Behaviour {
     /// Queue of actions to return when polled.
-    queued_events: VecDeque<ToSwarm<Event, Either<handler::relayed::Command, Either<Void, Void>>>>,
+    queued_events: VecDeque<ToSwarm<Event, Either<handler::relayed::Command, Void>>>,
 
     /// All direct (non-relayed) connections.
     direct_connections: HashMap<PeerId, HashSet<ConnectionId>>,
@@ -233,10 +233,7 @@ impl Behaviour {
 }
 
 impl NetworkBehaviour for Behaviour {
-    type ConnectionHandler = Either<
-        handler::relayed::Handler,
-        Either<handler::direct::Handler, dummy::ConnectionHandler>,
-    >;
+    type ConnectionHandler = Either<handler::relayed::Handler, dummy::ConnectionHandler>;
     type ToSwarm = Event;
 
     fn handle_established_inbound_connection(
@@ -262,7 +259,7 @@ impl NetworkBehaviour for Behaviour {
             "state mismatch"
         );
 
-        Ok(Either::Right(Either::Right(dummy::ConnectionHandler)))
+        Ok(Either::Right(dummy::ConnectionHandler))
     }
 
     fn handle_established_outbound_connection(
@@ -293,12 +290,19 @@ impl NetworkBehaviour for Behaviour {
                 );
             }
 
-            return Ok(Either::Right(Either::Left(
-                handler::direct::Handler::default(),
-            )));
+            self.queued_events.extend([
+                ToSwarm::NotifyHandler {
+                    peer_id: peer,
+                    handler: NotifyHandler::One(relayed_connection_id),
+                    event: Either::Left(handler::relayed::Command::UpgradeFinishedDontKeepAlive),
+                },
+                ToSwarm::GenerateEvent(Event::DirectConnectionUpgradeSucceeded {
+                    remote_peer_id: peer,
+                }),
+            ]);
         }
 
-        Ok(Either::Right(Either::Right(dummy::ConnectionHandler)))
+        Ok(Either::Right(dummy::ConnectionHandler))
     }
 
     fn on_connection_handler_event(
@@ -383,21 +387,7 @@ impl NetworkBehaviour for Behaviour {
                     .or_default() += 1;
                 self.queued_events.push_back(ToSwarm::Dial { opts });
             }
-            Either::Right(Either::Left(handler::direct::Event::DirectConnectionEstablished)) => {
-                self.queued_events.extend([
-                    ToSwarm::NotifyHandler {
-                        peer_id: event_source,
-                        handler: NotifyHandler::One(relayed_connection_id),
-                        event: Either::Left(
-                            handler::relayed::Command::UpgradeFinishedDontKeepAlive,
-                        ),
-                    },
-                    ToSwarm::GenerateEvent(Event::DirectConnectionUpgradeSucceeded {
-                        remote_peer_id: event_source,
-                    }),
-                ]);
-            }
-            Either::Right(Either::Right(never)) => void::unreachable(never),
+            Either::Right(never) => void::unreachable(never),
         };
     }
 

protocols/dcutr/src/handler.rs

@@ -18,5 +18,4 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-pub(crate) mod direct;
 pub(crate) mod relayed;