core/: Fix ConectionClose and PendingAborted reporting

mxinden · Aug 20, 2021 · a78de13 · a78de13
1 parent 174693a
commit a78de13
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/core/src/connection/pool.rs b/core/src/connection/pool.rs
@@ -384,32 +384,20 @@ impl<THandler: IntoConnectionHandler, TTransErr> Pool<THandler, TTransErr> {
     /// > performing such an orderly close.
     pub fn disconnect(&mut self, peer: &PeerId) {
         if let Some(conns) = self.established.get(peer) {
-            // Count upwards because we push to / pop from the end. See also `Pool::poll`.
             for (&id, endpoint) in conns.iter() {
                 if let Some(manager::Entry::Established(e)) = self.manager.entry(id) {
                     e.start_close(None);
-                    // TODO: I removed the disconnected logic, thus depending on start_close to
-                    // eventually trigger a ConnectionClosed event. Make sure that is the case.
                 }
-                self.counters.dec_established(endpoint);
             }
         }
-        self.established.remove(peer);
 
-        let mut aborted = Vec::new();
         for (&id, (_endpoint, peer2)) in &self.pending {
             if Some(peer) == peer2.as_ref() {
                 if let Some(manager::Entry::Pending(e)) = self.manager.entry(id) {
                     e.abort();
-                    aborted.push(id);
                 }
             }
         }
-        for id in aborted {
-            if let Some((endpoint, _)) = self.pending.remove(&id) {
-                self.counters.dec_pending(&endpoint);
-            }
-        }
     }
 
     /// Counts the number of established connections to the given peer.

diff --git a/protocols/relay/tests/lib.rs b/protocols/relay/tests/lib.rs
@@ -1151,7 +1151,7 @@ impl CombinedBehaviour {
         &mut self,
         _: &mut Context,
         _: &mut impl PollParameters,
-    ) -> Poll<NetworkBehaviourAction<CombinedEvent, <Self as NetworkBehaviour>::ProtocolsHandler> {
+    ) -> Poll<NetworkBehaviourAction<CombinedEvent, <Self as NetworkBehaviour>::ProtocolsHandler>> {
         if !self.events.is_empty() {
             return Poll::Ready(NetworkBehaviourAction::GenerateEvent(self.events.remove(0)));
         }

diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
@@ -1353,17 +1353,15 @@ mod tests {
         <<TBehaviour::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent: Clone
     {
         for s in &[swarm1, swarm2] {
-            if s.behaviour.inject_connection_closed.len() < num_connections {
-                assert_eq!(s.behaviour.inject_disconnected.len(), 0);
-            } else {
-                assert_eq!(s.behaviour.inject_disconnected.len(), 1);
-            }
             assert_eq!(s.behaviour.inject_connection_established.len(), 0);
             assert_eq!(s.behaviour.inject_connected.len(), 0);
         }
         [swarm1, swarm2]
             .iter()
-            .all(|s| s.behaviour.inject_connection_closed.len() == num_connections)
+            .all(|s| s.behaviour.inject_connection_closed.len() == num_connections) &&
+            [swarm1, swarm2]
+            .iter()
+            .all(|s| s.behaviour.inject_disconnected.len() == 1)
     }
 
     /// Establishes multiple connections between two peers,