From c3e648e65d4063471eb43f53d9419970129a6013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Tue, 11 Oct 2022 22:27:26 +0100
Subject: [PATCH] autonat/behaviour: remove no longer needed inject methods

---
 protocols/autonat/src/behaviour.rs | 119 +----------------------------
 1 file changed, 3 insertions(+), 116 deletions(-)

diff --git a/protocols/autonat/src/behaviour.rs b/protocols/autonat/src/behaviour.rs
index 5c2024dd40f5..9c44efa6ba21 100644
--- a/protocols/autonat/src/behaviour.rs
+++ b/protocols/autonat/src/behaviour.rs
@@ -29,15 +29,15 @@ pub use as_server::{InboundProbeError, InboundProbeEvent};
 use futures_timer::Delay;
 use instant::Instant;
 use libp2p_core::{
-    connection::ConnectionId, multiaddr::Protocol, transport::ListenerId, ConnectedPoint, Endpoint,
+    connection::ConnectionId, multiaddr::Protocol, ConnectedPoint, Endpoint,
     Multiaddr, PeerId,
 };
 use libp2p_request_response::{
-    handler::RequestResponseHandlerEvent, ProtocolSupport, RequestId, RequestResponse,
+    ProtocolSupport, RequestId, RequestResponse,
     RequestResponseConfig, RequestResponseEvent, RequestResponseMessage, ResponseChannel,
 };
 use libp2p_swarm::{
-    behaviour::FromSwarm, DialError, IntoConnectionHandler, NetworkBehaviour,
+    behaviour::FromSwarm, DialError, NetworkBehaviour,
     NetworkBehaviourAction, PollParameters,
 };
 use std::{
@@ -428,78 +428,6 @@ impl NetworkBehaviour for Behaviour {
     type ConnectionHandler = <RequestResponse<AutoNatCodec> as NetworkBehaviour>::ConnectionHandler;
     type OutEvent = Event;
 
-    fn inject_connection_established(
-        &mut self,
-        peer: &PeerId,
-        conn: &ConnectionId,
-        endpoint: &ConnectedPoint,
-        failed_addresses: Option<&Vec<Multiaddr>>,
-        other_established: usize,
-    ) {
-        let failed_addresses = failed_addresses
-            .map(|v| v.as_slice())
-            .unwrap_or_else(|| &[]);
-        self.on_connection_established(*peer, *conn, endpoint, failed_addresses, other_established)
-    }
-
-    fn inject_connection_closed(
-        &mut self,
-        peer: &PeerId,
-        conn: &ConnectionId,
-        endpoint: &ConnectedPoint,
-        handler: <Self::ConnectionHandler as IntoConnectionHandler>::Handler,
-        remaining_established: usize,
-    ) {
-        self.on_connection_closed(*peer, *conn, endpoint, handler, remaining_established)
-    }
-
-    fn inject_dial_failure(
-        &mut self,
-        peer: Option<PeerId>,
-        handler: Self::ConnectionHandler,
-        error: &DialError,
-    ) {
-        self.on_dial_failure(peer, handler, error)
-    }
-
-    fn inject_address_change(
-        &mut self,
-        peer: &PeerId,
-        conn: &ConnectionId,
-        old: &ConnectedPoint,
-        new: &ConnectedPoint,
-    ) {
-        self.on_address_change(*peer, *conn, old, new)
-    }
-
-    fn inject_new_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
-        self.inner.on_swarm_event(FromSwarm::NewListenAddr {
-            listener_id: id,
-            addr,
-        });
-        self.as_client().on_new_address();
-    }
-
-    fn inject_expired_listen_addr(&mut self, id: ListenerId, addr: &Multiaddr) {
-        self.inner.on_swarm_event(FromSwarm::ExpiredListenAddr {
-            listener_id: id,
-            addr,
-        });
-        self.as_client().on_expired_address(addr);
-    }
-
-    fn inject_new_external_addr(&mut self, addr: &Multiaddr) {
-        self.inner
-            .on_swarm_event(FromSwarm::NewExternalAddr { addr });
-        self.as_client().on_new_address();
-    }
-
-    fn inject_expired_external_addr(&mut self, addr: &Multiaddr) {
-        self.inner
-            .on_swarm_event(FromSwarm::ExpiredExternalAddr { addr });
-        self.as_client().on_expired_address(addr);
-    }
-
     fn poll(&mut self, cx: &mut Context<'_>, params: &mut impl PollParameters) -> Poll<Action> {
         loop {
             if let Some(event) = self.pending_out_events.pop_front() {
@@ -553,47 +481,6 @@ impl NetworkBehaviour for Behaviour {
         self.inner.addresses_of_peer(peer)
     }
 
-    fn inject_event(
-        &mut self,
-        peer_id: PeerId,
-        conn: ConnectionId,
-        event: RequestResponseHandlerEvent<AutoNatCodec>,
-    ) {
-        self.inner.on_connection_handler_event(peer_id, conn, event)
-    }
-
-    fn inject_listen_failure(
-        &mut self,
-        local_addr: &Multiaddr,
-        send_back_addr: &Multiaddr,
-        handler: Self::ConnectionHandler,
-    ) {
-        self.inner.on_swarm_event(FromSwarm::ListenFailure {
-            local_addr,
-            send_back_addr,
-            handler,
-        });
-    }
-
-    fn inject_new_listener(&mut self, id: ListenerId) {
-        self.inner
-            .on_swarm_event(FromSwarm::NewListener { listener_id: id })
-    }
-
-    fn inject_listener_error(&mut self, id: ListenerId, err: &(dyn std::error::Error + 'static)) {
-        self.inner.on_swarm_event(FromSwarm::ListenerError {
-            listener_id: id,
-            err,
-        });
-    }
-
-    fn inject_listener_closed(&mut self, id: ListenerId, reason: Result<(), &std::io::Error>) {
-        self.inner.on_swarm_event(FromSwarm::ListenerClosed {
-            listener_id: id,
-            reason,
-        });
-    }
-
     fn on_swarm_event(&mut self, event: FromSwarm<Self::ConnectionHandler>) {
         match event {
             FromSwarm::ConnectionEstablished {