apply suggested fixes

libp2p · Oct 18, 2023 · f6fce0b · f6fce0b
1 parent 8e7a425
commit f6fce0b
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -84,7 +84,7 @@ libp2p-floodsub = { version = "0.43.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.45.2", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.43.1", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.5" }
-libp2p-kad = { version = "0.44.7", path = "protocols/kad" }
+libp2p-kad = { version = "0.44.6", path = "protocols/kad" }
 libp2p-mdns = { version = "0.44.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.1.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.13.1", path = "misc/metrics" }

diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
@@ -1,5 +1,3 @@
-## 0.44.7 - unreleased
-
 ## 0.44.6 - unreleased
 
 - Rename `Kademlia` symbols to follow naming convention.

diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
-version = "0.44.7"
+version = "0.44.6"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
@@ -718,7 +718,7 @@ impl ConnectionHandler for Handler {
     }
 
     fn connection_keep_alive(&self) -> KeepAlive {
-        KeepAlive::No
+        self.keep_alive
     }
 
     fn poll(

diff --git a/protocols/relay/src/behaviour/handler.rs b/protocols/relay/src/behaviour/handler.rs
@@ -880,7 +880,6 @@ impl ConnectionHandler for Handler {
             && self.circuit_accept_futures.is_empty()
             && self.circuit_deny_futures.is_empty()
             && self.circuits.is_empty()
-            && self.active_reservation.is_none()
         {
             #[allow(deprecated)]
             match self.keep_alive {

diff --git a/protocols/relay/src/priv_client/handler.rs b/protocols/relay/src/priv_client/handler.rs
@@ -495,8 +495,7 @@ impl ConnectionHandler for Handler {
             if matches!(self.reservation, Reservation::None) {
                 match self.keep_alive {
                     KeepAlive::Yes => {
-                        self.keep_alive =
-                            KeepAlive::Until(Instant::now() + Duration::from_secs(10));
+                        self.keep_alive = KeepAlive::Until(Instant::now() + Duration::from_secs(10));
                     }
                     KeepAlive::Until(_) => {}
                     KeepAlive::No => panic!("Handler never sets KeepAlive::No."),