Fix DialPeerCondition::Always handling (#1937)

* fix: always dial with condition Always * chore: changelog note * refactor: exhaustive DialPeerCondition matching Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
libp2p · Jan 27, 2021 · ab6fecd · ab6fecd
1 parent 8aeb7b3
commit ab6fecd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 - Make `OneShotHandler`s `max_dial_negotiate` limit configurable.
   [PR 1936](https://github.com/libp2p/rust-libp2p/pull/1936).
+
+- Fix handling of DialPeerCondition::Always.
+  [PR 1937](https://github.com/libp2p/rust-libp2p/pull/1937).
 
 # 0.27.0 [2021-01-12]
 

diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
@@ -691,11 +691,9 @@ where TBehaviour: NetworkBehaviour<ProtocolsHandler = THandler>,
                         this.behaviour.inject_dial_failure(&peer_id);
                     } else {
                         let condition_matched = match condition {
-                            DialPeerCondition::Disconnected
-                                if this.network.is_disconnected(&peer_id) => true,
-                            DialPeerCondition::NotDialing
-                                if !this.network.is_dialing(&peer_id) => true,
-                            _ => false
+                            DialPeerCondition::Disconnected => this.network.is_disconnected(&peer_id),
+                            DialPeerCondition::NotDialing => !this.network.is_dialing(&peer_id),
+                            DialPeerCondition::Always => true,
                         };
                         if condition_matched {
                             if ExpandedSwarm::dial(this, &peer_id).is_ok() {