From efe21629f20b68af611d44a7f32248a07ec37747 Mon Sep 17 00:00:00 2001 From: Darius Date: Sat, 17 Sep 2022 18:40:58 -0400 Subject: [PATCH 1/4] swarm/dial_with_handler: Provide peer_id to inject_dial_failure when connection limit has reached --- swarm/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs index 3cf9d24326f..94f5215e91e 100644 --- a/swarm/src/lib.rs +++ b/swarm/src/lib.rs @@ -535,7 +535,7 @@ where Ok(_connection_id) => Ok(()), Err((connection_limit, handler)) => { let error = DialError::ConnectionLimit(connection_limit); - self.behaviour.inject_dial_failure(None, handler, &error); + self.behaviour.inject_dial_failure(peer_id, handler, &error); Err(error) } } From 7165045450ad6dc2478f6cc59b8bdd936bbf7225 Mon Sep 17 00:00:00 2001 From: Darius Date: Thu, 22 Sep 2022 00:45:15 -0400 Subject: [PATCH 2/4] swarm/CHANGELOG: Added entry --- swarm/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md index ff8d3a27d84..f1121fa3364 100644 --- a/swarm/CHANGELOG.md +++ b/swarm/CHANGELOG.md @@ -4,6 +4,11 @@ [PR 2857]: https://github.com/libp2p/rust-libp2p/pull/2857 +- Fixed panic caused by `None` being passed into `NetworkBehaviour::inject_dial_failure` on `DialError::ConnectionLimit`. + +[PR 2928]: https://github.com/libp2p/rust-libp2p/pull/2928 + + # 0.39.0 - Remove deprecated `NetworkBehaviourEventProcess`. See [libp2p-swarm v0.38.0 changelog entry] for From 965c02cdf7e4241062ce88c2bab962857c9c40d6 Mon Sep 17 00:00:00 2001 From: Darius Date: Thu, 22 Sep 2022 17:32:52 -0400 Subject: [PATCH 3/4] Added entry to CHANGELOG.md and updated libp2p-swarm to v0.39.1 in Cargo.toml --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d53f78b611..3f77aa78e1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,8 @@ - Update to [`libp2p-noise` `v0.39.1`](transports/noise/CHANGELOG.md#0391). +- Update to [`libp2p-swarm` `v0.39.1`](swarm/CHANGELOG.md#0391). + # 0.48.0 - Update to [`libp2p-core` `v0.36.0`](core/CHANGELOG.md#0360). From eccde5c7c379a42465c4f8dd1eaf7145a7327f16 Mon Sep 17 00:00:00 2001 From: Darius Clark Date: Fri, 23 Sep 2022 03:33:38 -0400 Subject: [PATCH 4/4] Update swarm/CHANGELOG.md Co-authored-by: Thomas Eizinger --- swarm/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md index f1121fa3364..a523397fc7f 100644 --- a/swarm/CHANGELOG.md +++ b/swarm/CHANGELOG.md @@ -4,7 +4,7 @@ [PR 2857]: https://github.com/libp2p/rust-libp2p/pull/2857 -- Fixed panic caused by `None` being passed into `NetworkBehaviour::inject_dial_failure` on `DialError::ConnectionLimit`. +- Pass actual `PeerId` of dial to `NetworkBehaviour::inject_dial_failure` on `DialError::ConnectionLimit`. See [PR 2928]. [PR 2928]: https://github.com/libp2p/rust-libp2p/pull/2928