swarm: Split off "keep alive" functionality from DummyConnectionHandler

Cargo.toml

@@ -80,22 +80,22 @@ getrandom = "0.2.3" # Explicit dependency to be used in `wasm-bindgen` feature
 instant = "0.1.11" # Explicit dependency to be used in `wasm-bindgen` feature
 lazy_static = "1.2"
 
-libp2p-autonat = { version = "0.7.0", path = "protocols/autonat", optional = true }
+libp2p-autonat = { version = "0.8.0", path = "protocols/autonat", optional = true }
 libp2p-core = { version = "0.36.0", path = "core",  default-features = false }
-libp2p-dcutr = { version = "0.6.0", path = "protocols/dcutr",  optional = true }
-libp2p-floodsub = { version = "0.39.0", path = "protocols/floodsub", optional = true }
-libp2p-identify = { version = "0.39.0", path = "protocols/identify", optional = true }
-libp2p-kad = { version = "0.40.0", path = "protocols/kad", optional = true }
-libp2p-metrics = { version = "0.9.0", path = "misc/metrics", optional = true }
+libp2p-dcutr = { version = "0.7.0", path = "protocols/dcutr",  optional = true }
+libp2p-floodsub = { version = "0.40.0", path = "protocols/floodsub", optional = true }
+libp2p-identify = { version = "0.40.0", path = "protocols/identify", optional = true }
+libp2p-kad = { version = "0.41.0", path = "protocols/kad", optional = true }
+libp2p-metrics = { version = "0.10.0", path = "misc/metrics", optional = true }
 libp2p-mplex = { version = "0.36.0", path = "muxers/mplex", optional = true }
 libp2p-noise = { version = "0.39.0", path = "transports/noise", optional = true }
-libp2p-ping = { version = "0.39.0", path = "protocols/ping", optional = true }
+libp2p-ping = { version = "0.40.0", path = "protocols/ping", optional = true }
 libp2p-plaintext = { version = "0.36.0", path = "transports/plaintext", optional = true }
 libp2p-pnet = { version = "0.22.0", path = "transports/pnet", optional = true }
-libp2p-relay = { version = "0.12.0", path = "protocols/relay", optional = true }
-libp2p-rendezvous = { version = "0.9.0", path = "protocols/rendezvous", optional = true }
-libp2p-request-response = { version = "0.21.0", path = "protocols/request-response", optional = true }
-libp2p-swarm = { version = "0.39.0", path = "swarm" }
+libp2p-relay = { version = "0.13.0", path = "protocols/relay", optional = true }
+libp2p-rendezvous = { version = "0.10.0", path = "protocols/rendezvous", optional = true }
+libp2p-request-response = { version = "0.22.0", path = "protocols/request-response", optional = true }
+libp2p-swarm = { version = "0.40.0", path = "swarm" }
 libp2p-swarm-derive = { version = "0.30.0", path = "swarm-derive" }
 libp2p-uds = { version = "0.35.0", path = "transports/uds", optional = true }
 libp2p-wasm-ext = { version = "0.36.0", path = "transports/wasm-ext", default-features = false, optional = true }
@@ -109,12 +109,12 @@ smallvec = "1.6.1"
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
 libp2p-deflate = { version = "0.36.0", path = "transports/deflate", optional = true }
 libp2p-dns = { version = "0.36.0", path = "transports/dns", optional = true, default-features = false }
-libp2p-mdns = { version = "0.40.0", path = "protocols/mdns", optional = true, default-features = false }
+libp2p-mdns = { version = "0.41.0", path = "protocols/mdns", optional = true, default-features = false }
 libp2p-tcp = { version = "0.37.0", path = "transports/tcp", default-features = false, optional = true }
 libp2p-websocket = { version = "0.38.0", path = "transports/websocket", optional = true }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-libp2p-gossipsub = { version = "0.41.0", path = "protocols/gossipsub", optional = true }
+libp2p-gossipsub = { version = "0.42.0", path = "protocols/gossipsub", optional = true }
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }

misc/metrics/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.10.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
+- Update to `libp2p-dcutr` `v0.7.0`.
+
+- Update to `libp2p-ping` `v0.40.0`.
+
+- Update to `libp2p-identify` `v0.40.0`.
+
+- Update to `libp2p-relay` `v0.13.0`.
+
+- Update to `libp2p-relay` `v0.12.0`.
+
+- Update to `libp2p-kad` `v0.41.0`.
+
 # 0.9.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

misc/metrics/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-metrics"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Metrics for libp2p"
-version = "0.9.0"
+version = "0.10.0"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -20,16 +20,16 @@ dcutr = ["libp2p-dcutr"]
 
 [dependencies]
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-dcutr =  { version = "0.6.0", path = "../../protocols/dcutr", optional = true }
-libp2p-identify = { version = "0.39.0", path = "../../protocols/identify", optional = true }
-libp2p-kad = { version = "0.40.0", path = "../../protocols/kad", optional = true }
-libp2p-ping = { version = "0.39.0", path = "../../protocols/ping", optional = true }
-libp2p-relay =  { version = "0.12.0", path = "../../protocols/relay", optional = true }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-dcutr =  { version = "0.7.0", path = "../../protocols/dcutr", optional = true }
+libp2p-identify = { version = "0.40.0", path = "../../protocols/identify", optional = true }
+libp2p-kad = { version = "0.41.0", path = "../../protocols/kad", optional = true }
+libp2p-ping = { version = "0.40.0", path = "../../protocols/ping", optional = true }
+libp2p-relay =  { version = "0.13.0", path = "../../protocols/relay", optional = true }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 prometheus-client = "0.18.0"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-libp2p-gossipsub =  { version = "0.41.0", path = "../../protocols/gossipsub", optional = true }
+libp2p-gossipsub =  { version = "0.42.0", path = "../../protocols/gossipsub", optional = true }
 
 [dev-dependencies]
 log = "0.4.0"

misc/multistream-select/tests/transport.rs

@@ -28,7 +28,7 @@ use libp2p_core::{
 };
 use libp2p_mplex::MplexConfig;
 use libp2p_plaintext::PlainText2Config;
-use libp2p_swarm::{DummyBehaviour, Swarm, SwarmEvent};
+use libp2p_swarm::{DummyNetworkBehaviour, Swarm, SwarmEvent};
 use rand::random;
 use std::task::Poll;
 
@@ -61,8 +61,8 @@ fn transport_upgrade() {
 
         let listen_addr = Multiaddr::from(Protocol::Memory(random::<u64>()));
 
-        let mut dialer = Swarm::new(dialer_transport, DummyBehaviour::default(), dialer_id);
-        let mut listener = Swarm::new(listener_transport, DummyBehaviour::default(), listener_id);
+        let mut dialer = Swarm::new(dialer_transport, DummyNetworkBehaviour, dialer_id);
+        let mut listener = Swarm::new(listener_transport, DummyNetworkBehaviour, listener_id);
 
         listener.listen_on(listen_addr).unwrap();
         let (addr_sender, addr_receiver) = oneshot::channel();

protocols/autonat/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.8.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.7.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

protocols/autonat/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-autonat"
 edition = "2021"
 rust-version = "1.56.1"
 description = "NAT and firewall detection for libp2p"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["David Craven <david@craven.ch>", "Elena Frank <elena.frank@protonmail.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -19,8 +19,8 @@ futures = "0.3"
 futures-timer = "3.0"
 instant = "0.1"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
-libp2p-request-response = { version = "0.21.0", path = "../request-response" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
+libp2p-request-response = { version = "0.22.0", path = "../request-response" }
 log = "0.4"
 rand = "0.8"
 prost = "0.11"

protocols/dcutr/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.6.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

protocols/dcutr/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-dcutr"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Direct connection upgrade through relay"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -18,7 +18,7 @@ futures = "0.3.1"
 futures-timer = "3.0"
 instant = "0.1.11"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 log = "0.4"
 prost-codec = { version = "0.2", path = "../../misc/prost-codec" }
 prost = "0.11"

protocols/dcutr/src/handler.rs

@@ -23,8 +23,7 @@ use either::Either;
 use libp2p_core::connection::ConnectionId;
 use libp2p_core::upgrade::{self, DeniedUpgrade};
 use libp2p_core::{ConnectedPoint, PeerId};
-use libp2p_swarm::handler::DummyConnectionHandler;
-use libp2p_swarm::handler::SendWrapper;
+use libp2p_swarm::handler::{DummyConnectionHandler, SendWrapper};
 use libp2p_swarm::{ConnectionHandler, IntoConnectionHandler};
 
 pub mod direct;
@@ -52,7 +51,7 @@ impl IntoConnectionHandler for Prototype {
                 if endpoint.is_relayed() {
                     Either::Left(relayed::Handler::new(endpoint.clone()))
                 } else {
-                    Either::Right(Either::Right(DummyConnectionHandler::default()))
+                    Either::Right(Either::Right(DummyConnectionHandler))
                 }
             }
             Self::DirectConnection {

protocols/floodsub/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.40.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.39.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

protocols/floodsub/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-floodsub"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Floodsub protocol for libp2p"
-version = "0.39.0"
+version = "0.40.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -15,7 +15,7 @@ cuckoofilter = "0.5.0"
 fnv = "1.0"
 futures = "0.3.1"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 log = "0.4"
 prost = "0.11"
 rand = "0.7"

protocols/gossipsub/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.42.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.41.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

protocols/gossipsub/Cargo.toml

@@ -3,15 +3,15 @@ name = "libp2p-gossipsub"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Gossipsub protocol for libp2p"
-version = "0.41.0"
+version = "0.42.0"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
 bytes = "1.0"
 byteorder = "1.3.4"

protocols/identify/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.40.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.39.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

protocols/identify/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-identify"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Nodes identifcation protocol for libp2p"
-version = "0.39.0"
+version = "0.40.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -15,7 +15,7 @@ asynchronous-codec = "0.6"
 futures = "0.3.1"
 futures-timer = "3.0.2"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 log = "0.4.1"
 lru = "0.7.2"
 prost-codec = { version = "0.2", path = "../../misc/prost-codec" }

protocols/kad/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.41.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.40.0
 
 - Add support for multiple protocol names. Update `Kademlia`, `KademliaConfig`,

protocols/kad/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-kad"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Kademlia protocol for libp2p"
-version = "0.40.0"
+version = "0.41.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -19,7 +19,7 @@ asynchronous-codec = "0.6"
 futures = "0.3.1"
 log = "0.4"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 prost = "0.11"
 rand = "0.7.2"
 sha2 = "0.10.0"

protocols/mdns/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.41.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.40.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

protocols/mdns/Cargo.toml

@@ -2,7 +2,7 @@
 name = "libp2p-mdns"
 edition = "2021"
 rust-version = "1.56.1"
-version = "0.40.0"
+version = "0.41.0"
 description = "Implementation of the libp2p mDNS discovery method"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
@@ -17,7 +17,7 @@ futures = "0.3.13"
 if-watch = "1.1.1"
 lazy_static = "1.4.0"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 log = "0.4.14"
 rand = "0.8.3"
 smallvec = "1.6.1"

protocols/mdns/src/behaviour.rs

@@ -30,10 +30,8 @@ use futures::Stream;
 use if_watch::{IfEvent, IfWatcher};
 use libp2p_core::transport::ListenerId;
 use libp2p_core::{Multiaddr, PeerId};
-use libp2p_swarm::{
-    handler::DummyConnectionHandler, ConnectionHandler, NetworkBehaviour, NetworkBehaviourAction,
-    PollParameters,
-};
+use libp2p_swarm::handler::DummyConnectionHandler;
+use libp2p_swarm::{ConnectionHandler, NetworkBehaviour, NetworkBehaviourAction, PollParameters};
 use smallvec::SmallVec;
 use std::collections::hash_map::{Entry, HashMap};
 use std::{cmp, fmt, io, net::IpAddr, pin::Pin, task::Context, task::Poll, time::Instant};
@@ -124,7 +122,7 @@ where
     type OutEvent = MdnsEvent;
 
     fn new_handler(&mut self) -> Self::ConnectionHandler {
-        DummyConnectionHandler::default()
+        DummyConnectionHandler
     }
 
     fn addresses_of_peer(&mut self, peer_id: &PeerId) -> Vec<Multiaddr> {

protocols/ping/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.40.0 [unreleased]
+
+- Update to `libp2p-swarm` `v0.40.0`.
+
 # 0.39.0
 
 - Update to `libp2p-swarm` `v0.39.0`.

protocols/ping/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-ping"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Ping protocol for libp2p"
-version = "0.39.0"
+version = "0.40.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -15,7 +15,7 @@ futures = "0.3.1"
 futures-timer = "3.0.2"
 instant = "0.1.11"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
-libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
+libp2p-swarm = { version = "0.40.0", path = "../../swarm" }
 log = "0.4.1"
 rand = "0.7.2"
 void = "1.0"

protocols/ping/tests/ping.rs

@@ -30,7 +30,7 @@ use libp2p_core::{
 use libp2p_mplex as mplex;
 use libp2p_noise as noise;
 use libp2p_ping as ping;
-use libp2p_swarm::{DummyBehaviour, KeepAlive, Swarm, SwarmEvent};
+use libp2p_swarm::{KeepAliveBehaviour, Swarm, SwarmEvent};
 use libp2p_tcp::{GenTcpConfig, TcpTransport};
 use libp2p_yamux as yamux;
 use quickcheck::*;
@@ -188,11 +188,7 @@ fn max_failures() {
 #[test]
 fn unsupported_doesnt_fail() {
     let (peer1_id, trans) = mk_transport(MuxerChoice::Mplex);
-    let mut swarm1 = Swarm::new(
-        trans,
-        DummyBehaviour::with_keep_alive(KeepAlive::Yes),
-        peer1_id.clone(),
-    );
+    let mut swarm1 = Swarm::new(trans, KeepAliveBehaviour, peer1_id.clone());
 
     let (peer2_id, trans) = mk_transport(MuxerChoice::Mplex);
     let mut swarm2 = Swarm::new(