Revert "Add addresses field for closing listeners (libp2p#1485)"

This reverts commit 7bf5266
fluencelabs · Mar 30, 2020 · 3c183a2 · 3c183a2
1 parent c74696b
commit 3c183a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/core/src/network.rs b/core/src/network.rs
@@ -356,8 +356,8 @@ where
             Poll::Ready(ListenersEvent::AddressExpired { listener_id, listen_addr }) => {
                 return Poll::Ready(NetworkEvent::ExpiredListenerAddress { listener_id, listen_addr })
             }
-            Poll::Ready(ListenersEvent::Closed { listener_id, addresses, reason }) => {
-                return Poll::Ready(NetworkEvent::ListenerClosed { listener_id, addresses, reason })
+            Poll::Ready(ListenersEvent::Closed { listener_id, reason }) => {
+                return Poll::Ready(NetworkEvent::ListenerClosed { listener_id, reason })
             }
             Poll::Ready(ListenersEvent::Error { listener_id, error }) => {
                 return Poll::Ready(NetworkEvent::ListenerError { listener_id, error })

diff --git a/core/src/network/event.rs b/core/src/network/event.rs
@@ -54,8 +54,6 @@ where
     ListenerClosed {
         /// The listener ID that closed.
         listener_id: ListenerId,
-        /// The addresses that the listener was listening on.
-        addresses: Vec<Multiaddr>,
         /// Reason for the closure. Contains `Ok(())` if the stream produced `None`, or `Err`
         /// if the stream produced an error.
         reason: Result<(), TTrans::Error>,
@@ -184,10 +182,9 @@ where
                     .field("listen_addr", listen_addr)
                     .finish()
             }
-            NetworkEvent::ListenerClosed { listener_id, addresses, reason } => {
+            NetworkEvent::ListenerClosed { listener_id, reason } => {
                 f.debug_struct("ListenerClosed")
                     .field("listener_id", listener_id)
-                    .field("addresses", addresses)
                     .field("reason", reason)
                     .finish()
             }
@@ -345,3 +342,4 @@ where
         self.info().to_connected_point()
     }
 }
+
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
@@ -445,11 +445,8 @@ where TBehaviour: NetworkBehaviour<ProtocolsHandler = THandler>,
                     this.behaviour.inject_expired_listen_addr(&listen_addr);
                     return Poll::Ready(SwarmEvent::ExpiredListenAddr(listen_addr));
                 }
-                Poll::Ready(NetworkEvent::ListenerClosed { listener_id, addresses, reason }) => {
+                Poll::Ready(NetworkEvent::ListenerClosed { listener_id, reason }) => {
                     log::debug!("Listener {:?}; Closed by {:?}.", listener_id, reason);
-                    for addr in addresses.iter() {
-                        this.behaviour.inject_expired_listen_addr(addr);
-                    }
                     this.behaviour.inject_listener_closed(listener_id);
                 }
                 Poll::Ready(NetworkEvent::ListenerError { listener_id, error }) =>