fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-04-25 11:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix DialPeerCondition::Always handling (#1937)

Browse Source 
* fix: always dial with condition Always

* chore: changelog note

* refactor: exhaustive DialPeerCondition matching

Co-authored-by: Roman Borschel <romanb@users.noreply.github.com>
This commit is contained in:
Joonas Koivunen 2021-01-27 12:05:35 +02:00 committed by GitHub
parent 8aeb7b3db0
commit ab6fecd9f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swarm/CHANGELOG.md
View File

@ -3,6 +3,9 @@
- Make `OneShotHandler`s `max_dial_negotiate` limit configurable. - Make `OneShotHandler`s `max_dial_negotiate` limit configurable.
[PR 1936](https://github.com/libp2p/rust-libp2p/pull/1936). [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] # 0.27.0 [2021-01-12]
- Update dependencies. - Update dependencies.

8
swarm/src/lib.rs
View File

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