From e2fcc47da6565ec25c1fb6c0db3ecb80fc5d900e Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Mon, 28 Feb 2022 10:27:58 +0100 Subject: [PATCH] swarm/src/behaviour: Remove Send bound from NetworkBehaviour (#2535) The bound is no longer needed across the libp2p-XXX crates. Co-authored-by: Max Inden --- CHANGELOG.md | 15 +++++++++++++ Cargo.toml | 28 ++++++++++++------------- misc/metrics/CHANGELOG.md | 14 +++++++++++++ misc/metrics/Cargo.toml | 16 +++++++------- protocols/autonat/CHANGELOG.md | 6 ++++++ protocols/autonat/Cargo.toml | 6 +++--- protocols/dcutr/CHANGELOG.md | 4 ++++ protocols/dcutr/Cargo.toml | 4 ++-- protocols/dcutr/tests/lib.rs | 2 +- protocols/floodsub/CHANGELOG.md | 4 ++++ protocols/floodsub/Cargo.toml | 4 ++-- protocols/gossipsub/CHANGELOG.md | 4 ++++ protocols/gossipsub/Cargo.toml | 4 ++-- protocols/identify/CHANGELOG.md | 4 ++++ protocols/identify/Cargo.toml | 4 ++-- protocols/kad/CHANGELOG.md | 4 ++++ protocols/kad/Cargo.toml | 4 ++-- protocols/mdns/CHANGELOG.md | 4 ++++ protocols/mdns/Cargo.toml | 4 ++-- protocols/ping/CHANGELOG.md | 4 ++++ protocols/ping/Cargo.toml | 4 ++-- protocols/relay/CHANGELOG.md | 4 ++++ protocols/relay/Cargo.toml | 4 ++-- protocols/relay/tests/v1.rs | 2 +- protocols/relay/tests/v2.rs | 2 +- protocols/rendezvous/CHANGELOG.md | 4 ++++ protocols/rendezvous/Cargo.toml | 4 ++-- protocols/rendezvous/tests/harness.rs | 6 +++--- protocols/request-response/CHANGELOG.md | 4 ++++ protocols/request-response/Cargo.toml | 4 ++-- swarm/CHANGELOG.md | 6 ++++++ swarm/Cargo.toml | 2 +- swarm/src/behaviour.rs | 2 +- 33 files changed, 134 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77248e1c..1db7fe1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,21 @@ # `libp2p` facade crate +## 0.44.0 [unreleased] + +- Update individual crates. + - Update to [`libp2p-dcutr` `v0.2.0`](protocols/dcutr/CHANGELOG.md). + - Update to [`libp2p-rendezvous` `v0.5.0`](protocols/rendezvous/CHANGELOG.md). + - Update to [`libp2p-ping` `v0.35.0`](protocols/ping/CHANGELOG.md). + - Update to [`libp2p-identify` `v0.35.0`](protocols/identify/CHANGELOG.md). + - Update to [`libp2p-floodsub` `v0.35.0`](protocols/floodsub/CHANGELOG.md). + - Update to [`libp2p-relay` `v0.8.0`](protocols/relay/CHANGELOG.md). + - Update to [`libp2p-metrics` `v0.5.0`](misc/metrics/CHANGELOG.md). + - Update to [`libp2p-kad` `v0.36.0`](protocols/kad/CHANGELOG.md). + - Update to [`libp2p-autonat` `v0.3.0`](protocols/autonat/CHANGELOG.md). + - Update to [`libp2p-request-response` `v0.17.0`](protocols/request-response/CHANGELOG.md). + - Update to [`libp2p-swarm` `v0.35.0`](swarm/CHANGELOG.md). + ## Version 0.43.0 [2022-02-22] - Update individual crates. diff --git a/Cargo.toml b/Cargo.toml index 9f1e638d..f712bf2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p" edition = "2021" rust-version = "1.56.1" description = "Peer-to-peer networking library" -version = "0.43.0" +version = "0.44.0" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -77,22 +77,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.2.0", path = "protocols/autonat", optional = true } +libp2p-autonat = { version = "0.3.0", path = "protocols/autonat", optional = true } libp2p-core = { version = "0.32.0", path = "core", default-features = false } -libp2p-dcutr = { version = "0.1.0", path = "protocols/dcutr", optional = true } -libp2p-floodsub = { version = "0.34.0", path = "protocols/floodsub", optional = true } -libp2p-identify = { version = "0.34.0", path = "protocols/identify", optional = true } -libp2p-kad = { version = "0.35.0", path = "protocols/kad", optional = true } -libp2p-metrics = { version = "0.4.0", path = "misc/metrics", optional = true } +libp2p-dcutr = { version = "0.2.0", path = "protocols/dcutr", optional = true } +libp2p-floodsub = { version = "0.35.0", path = "protocols/floodsub", optional = true } +libp2p-identify = { version = "0.35.0", path = "protocols/identify", optional = true } +libp2p-kad = { version = "0.36.0", path = "protocols/kad", optional = true } +libp2p-metrics = { version = "0.5.0", path = "misc/metrics", optional = true } libp2p-mplex = { version = "0.32.0", path = "muxers/mplex", optional = true } libp2p-noise = { version = "0.35.0", path = "transports/noise", optional = true } -libp2p-ping = { version = "0.34.0", path = "protocols/ping", optional = true } +libp2p-ping = { version = "0.35.0", path = "protocols/ping", optional = true } libp2p-plaintext = { version = "0.32.0", path = "transports/plaintext", optional = true } libp2p-pnet = { version = "0.22.0", path = "transports/pnet", optional = true } -libp2p-relay = { version = "0.7.0", path = "protocols/relay", optional = true } -libp2p-rendezvous = { version = "0.4.0", path = "protocols/rendezvous", optional = true } -libp2p-request-response = { version = "0.16.0", path = "protocols/request-response", optional = true } -libp2p-swarm = { version = "0.34.0", path = "swarm" } +libp2p-relay = { version = "0.8.0", path = "protocols/relay", optional = true } +libp2p-rendezvous = { version = "0.5.0", path = "protocols/rendezvous", optional = true } +libp2p-request-response = { version = "0.17.0", path = "protocols/request-response", optional = true } +libp2p-swarm = { version = "0.35.0", path = "swarm" } libp2p-swarm-derive = { version = "0.27.0", path = "swarm-derive" } libp2p-uds = { version = "0.32.0", path = "transports/uds", optional = true } libp2p-wasm-ext = { version = "0.32.0", path = "transports/wasm-ext", default-features = false, optional = true } @@ -106,12 +106,12 @@ smallvec = "1.6.1" [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies] libp2p-deflate = { version = "0.32.0", path = "transports/deflate", optional = true } libp2p-dns = { version = "0.32.0", path = "transports/dns", optional = true, default-features = false } -libp2p-mdns = { version = "0.35.0", path = "protocols/mdns", optional = true } +libp2p-mdns = { version = "0.36.0", path = "protocols/mdns", optional = true } libp2p-tcp = { version = "0.32.0", path = "transports/tcp", default-features = false, optional = true } libp2p-websocket = { version = "0.34.0", path = "transports/websocket", optional = true } [target.'cfg(not(target_os = "unknown"))'.dependencies] -libp2p-gossipsub = { version = "0.36.0", path = "protocols/gossipsub", optional = true } +libp2p-gossipsub = { version = "0.37.0", path = "protocols/gossipsub", optional = true } [dev-dependencies] async-std = { version = "1.6.2", features = ["attributes"] } diff --git a/misc/metrics/CHANGELOG.md b/misc/metrics/CHANGELOG.md index 934e190f..620bf0b3 100644 --- a/misc/metrics/CHANGELOG.md +++ b/misc/metrics/CHANGELOG.md @@ -1,3 +1,17 @@ +# 0.5.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + +- Update to `libp2p-dcutr` `v0.2.0`. + +- Update to `libp2p-ping` `v0.35.0`. + +- Update to `libp2p-identify` `v0.35.0`. + +- Update to `libp2p-relay` `v0.8.0`. + +- Update to `libp2p-kad` `v0.36.0`. + # 0.4.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml index e784e167..d2c380f1 100644 --- a/misc/metrics/Cargo.toml +++ b/misc/metrics/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p-metrics" edition = "2021" rust-version = "1.56.1" description = "Metrics for libp2p" -version = "0.4.0" +version = "0.5.0" authors = ["Max Inden "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -20,16 +20,16 @@ dcutr = ["libp2p-dcutr"] [dependencies] libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } -libp2p-dcutr = { version = "0.1.0", path = "../../protocols/dcutr", optional = true } -libp2p-identify = { version = "0.34.0", path = "../../protocols/identify", optional = true } -libp2p-kad = { version = "0.35.0", path = "../../protocols/kad", optional = true } -libp2p-ping = { version = "0.34.0", path = "../../protocols/ping", optional = true } -libp2p-relay = { version = "0.7.0", path = "../../protocols/relay", optional = true } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-dcutr = { version = "0.2.0", path = "../../protocols/dcutr", optional = true } +libp2p-identify = { version = "0.35.0", path = "../../protocols/identify", optional = true } +libp2p-kad = { version = "0.36.0", path = "../../protocols/kad", optional = true } +libp2p-ping = { version = "0.35.0", path = "../../protocols/ping", optional = true } +libp2p-relay = { version = "0.8.0", path = "../../protocols/relay", optional = true } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } prometheus-client = "0.15.0" [target.'cfg(not(target_os = "unknown"))'.dependencies] -libp2p-gossipsub = { version = "0.36.0", path = "../../protocols/gossipsub", optional = true } +libp2p-gossipsub = { version = "0.37.0", path = "../../protocols/gossipsub", optional = true } [dev-dependencies] env_logger = "0.8.1" diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md index 9b4238d5..cc89a31a 100644 --- a/protocols/autonat/CHANGELOG.md +++ b/protocols/autonat/CHANGELOG.md @@ -1,3 +1,9 @@ +# 0.3.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + +- Update to `libp2p-request-response` `v0.17.0`. + # 0.2.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml index fd683b6b..d08e186b 100644 --- a/protocols/autonat/Cargo.toml +++ b/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.2.0" +version = "0.3.0" authors = ["David Craven ", "Elena Frank "] 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.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } -libp2p-request-response = { version = "0.16.0", path = "../request-response" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } +libp2p-request-response = { version = "0.17.0", path = "../request-response" } log = "0.4" rand = "0.8" prost = "0.9" diff --git a/protocols/dcutr/CHANGELOG.md b/protocols/dcutr/CHANGELOG.md index 951eec0e..47bf0aa6 100644 --- a/protocols/dcutr/CHANGELOG.md +++ b/protocols/dcutr/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.2.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.1.0 [2022-02-22] - Initial release. \ No newline at end of file diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index e32c2114..c18909be 100644 --- a/protocols/dcutr/Cargo.toml +++ b/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.1.0" +version = "0.2.0" authors = ["Max Inden "] 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.32", path = "../../core" } -libp2p-swarm = { version = "0.34", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } log = "0.4" prost = "0.7" thiserror = "1.0" diff --git a/protocols/dcutr/tests/lib.rs b/protocols/dcutr/tests/lib.rs index a53a5319..6a10d104 100644 --- a/protocols/dcutr/tests/lib.rs +++ b/protocols/dcutr/tests/lib.rs @@ -175,7 +175,7 @@ impl From for ClientEvent { } } -fn spawn_swarm_on_pool(pool: &LocalPool, swarm: Swarm) { +fn spawn_swarm_on_pool(pool: &LocalPool, swarm: Swarm) { pool.spawner() .spawn_obj(swarm.collect::>().map(|_| ()).boxed().into()) .unwrap(); diff --git a/protocols/floodsub/CHANGELOG.md b/protocols/floodsub/CHANGELOG.md index 42339e52..ee414206 100644 --- a/protocols/floodsub/CHANGELOG.md +++ b/protocols/floodsub/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.35.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.34.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index d3b765d1..3ec95e8e 100644 --- a/protocols/floodsub/Cargo.toml +++ b/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.34.0" +version = "0.35.0" authors = ["Parity Technologies "] 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.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } log = "0.4" prost = "0.9" rand = "0.7" diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md index c88de8e1..72e86a42 100644 --- a/protocols/gossipsub/CHANGELOG.md +++ b/protocols/gossipsub/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.37.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.36.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml index a765fb38..ccd59d6d 100644 --- a/protocols/gossipsub/Cargo.toml +++ b/protocols/gossipsub/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p-gossipsub" edition = "2021" rust-version = "1.56.1" description = "Gossipsub protocol for libp2p" -version = "0.36.0" +version = "0.37.0" authors = ["Age Manning "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -11,7 +11,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"] categories = ["network-programming", "asynchronous"] [dependencies] -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } bytes = "1.0" byteorder = "1.3.4" diff --git a/protocols/identify/CHANGELOG.md b/protocols/identify/CHANGELOG.md index 40eae884..171dcbf4 100644 --- a/protocols/identify/CHANGELOG.md +++ b/protocols/identify/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.35.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.34.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index ccce7b29..ca49107a 100644 --- a/protocols/identify/Cargo.toml +++ b/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.34.0" +version = "0.35.0" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] futures = "0.3.1" futures-timer = "3.0.2" libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } log = "0.4.1" lru = "0.7.2" prost = "0.9" diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md index 2631e9c5..2a64652e 100644 --- a/protocols/kad/CHANGELOG.md +++ b/protocols/kad/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.36.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.35.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index 684a71e7..a22a8090 100644 --- a/protocols/kad/Cargo.toml +++ b/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.35.0" +version = "0.36.0" authors = ["Parity Technologies "] 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.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } prost = "0.9" rand = "0.7.2" sha2 = "0.10.0" diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md index f61c0c69..362cc213 100644 --- a/protocols/mdns/CHANGELOG.md +++ b/protocols/mdns/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.36.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.35.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 442c8636..92566f6d 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -2,7 +2,7 @@ name = "libp2p-mdns" edition = "2021" rust-version = "1.56.1" -version = "0.35.0" +version = "0.36.0" description = "Implementation of the libp2p mDNS discovery method" authors = ["Parity Technologies "] license = "MIT" @@ -18,7 +18,7 @@ futures = "0.3.13" if-watch = "1.0.0" lazy_static = "1.4.0" libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } log = "0.4.14" rand = "0.8.3" smallvec = "1.6.1" diff --git a/protocols/ping/CHANGELOG.md b/protocols/ping/CHANGELOG.md index 90ea2c4d..54b761e1 100644 --- a/protocols/ping/CHANGELOG.md +++ b/protocols/ping/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.35.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.34.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml index a4be5688..e238f402 100644 --- a/protocols/ping/Cargo.toml +++ b/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.34.0" +version = "0.35.0" authors = ["Parity Technologies "] 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.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } log = "0.4.1" rand = "0.7.2" void = "1.0" diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md index 590fd102..3cf5b0ae 100644 --- a/protocols/relay/CHANGELOG.md +++ b/protocols/relay/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.8.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.7.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml index 13415e00..5dfcce41 100644 --- a/protocols/relay/Cargo.toml +++ b/protocols/relay/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p-relay" edition = "2021" rust-version = "1.56.1" description = "Communications relaying for libp2p" -version = "0.7.0" +version = "0.8.0" authors = ["Parity Technologies ", "Max Inden "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -18,7 +18,7 @@ futures = "0.3.1" futures-timer = "3" instant = "0.1.11" libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } log = "0.4" pin-project = "1" prost = "0.9" diff --git a/protocols/relay/tests/v1.rs b/protocols/relay/tests/v1.rs index 6d6f97ac..1da368f6 100644 --- a/protocols/relay/tests/v1.rs +++ b/protocols/relay/tests/v1.rs @@ -1369,7 +1369,7 @@ fn build_keep_alive_only_swarm() -> Swarm { ) } -fn spawn_swarm_on_pool(pool: &LocalPool, mut swarm: Swarm) { +fn spawn_swarm_on_pool(pool: &LocalPool, mut swarm: Swarm) { pool.spawner() .spawn_obj( async move { diff --git a/protocols/relay/tests/v2.rs b/protocols/relay/tests/v2.rs index ea4b8b8f..c0d084aa 100644 --- a/protocols/relay/tests/v2.rs +++ b/protocols/relay/tests/v2.rs @@ -397,7 +397,7 @@ impl From for ClientEvent { } } -fn spawn_swarm_on_pool(pool: &LocalPool, swarm: Swarm) { +fn spawn_swarm_on_pool(pool: &LocalPool, swarm: Swarm) { pool.spawner() .spawn_obj(swarm.collect::>().map(|_| ()).boxed().into()) .unwrap(); diff --git a/protocols/rendezvous/CHANGELOG.md b/protocols/rendezvous/CHANGELOG.md index 72c42f54..fc1c2462 100644 --- a/protocols/rendezvous/CHANGELOG.md +++ b/protocols/rendezvous/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.5.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.4.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml index 02e1bb13..54f35bc0 100644 --- a/protocols/rendezvous/Cargo.toml +++ b/protocols/rendezvous/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p-rendezvous" edition = "2021" rust-version = "1.56.1" description = "Rendezvous protocol for libp2p" -version = "0.4.0" +version = "0.5.0" authors = ["The COMIT guys "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] asynchronous-codec = "0.6" libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } prost = "0.9" void = "1" log = "0.4" diff --git a/protocols/rendezvous/tests/harness.rs b/protocols/rendezvous/tests/harness.rs index 3709e509..3602d666 100644 --- a/protocols/rendezvous/tests/harness.rs +++ b/protocols/rendezvous/tests/harness.rs @@ -140,7 +140,7 @@ pub trait SwarmExt { /// Establishes a connection to the given [`Swarm`], polling both of them until the connection is established. async fn block_on_connection(&mut self, other: &mut Swarm) where - T: NetworkBehaviour, + T: NetworkBehaviour + Send, ::OutEvent: Debug; /// Listens on a random memory address, polling the [`Swarm`] until the transport is ready to accept connections. @@ -153,12 +153,12 @@ pub trait SwarmExt { #[async_trait] impl SwarmExt for Swarm where - B: NetworkBehaviour, + B: NetworkBehaviour + Send, ::OutEvent: Debug, { async fn block_on_connection(&mut self, other: &mut Swarm) where - T: NetworkBehaviour, + T: NetworkBehaviour + Send, ::OutEvent: Debug, { let addr_to_dial = other.external_addresses().next().unwrap().addr.clone(); diff --git a/protocols/request-response/CHANGELOG.md b/protocols/request-response/CHANGELOG.md index 94522708..15c0b07e 100644 --- a/protocols/request-response/CHANGELOG.md +++ b/protocols/request-response/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.17.0 [unreleased] + +- Update to `libp2p-swarm` `v0.35.0`. + # 0.16.0 [2022-02-22] - Update to `libp2p-core` `v0.32.0`. diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml index a7f28429..8d696ec7 100644 --- a/protocols/request-response/Cargo.toml +++ b/protocols/request-response/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p-request-response" edition = "2021" rust-version = "1.56.1" description = "Generic Request/Response Protocols" -version = "0.16.0" +version = "0.17.0" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" @@ -16,7 +16,7 @@ bytes = "1" futures = "0.3.1" instant = "0.1.11" libp2p-core = { version = "0.32.0", path = "../../core", default-features = false } -libp2p-swarm = { version = "0.34.0", path = "../../swarm" } +libp2p-swarm = { version = "0.35.0", path = "../../swarm" } log = "0.4.11" rand = "0.7" smallvec = "1.6.1" diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md index a142e232..e97c6061 100644 --- a/swarm/CHANGELOG.md +++ b/swarm/CHANGELOG.md @@ -1,3 +1,9 @@ +# 0.35.0 [unreleased] + +- Remove `Send` bound from `NetworkBehaviour`. See [PR 2535]. + +[PR 2535]: https://github.com/libp2p/rust-libp2p/pull/2535/ + # 0.34.0 [2022-02-22] - Rename `ProtocolsHandler` to `ConnectionHandler`. Upgrade should be as simple as renaming all diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml index 29963312..63709d36 100644 --- a/swarm/Cargo.toml +++ b/swarm/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p-swarm" edition = "2021" rust-version = "1.56.1" description = "The libp2p swarm" -version = "0.34.0" +version = "0.35.0" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs index 20b607c3..6e2a163c 100644 --- a/swarm/src/behaviour.rs +++ b/swarm/src/behaviour.rs @@ -165,7 +165,7 @@ pub(crate) type THandlerOutEvent = /// Optionally one can provide a custom `poll` function through the `#[behaviour(poll_method = /// "poll")]` attribute. This function must have the same signature as the [`NetworkBehaviour#poll`] /// function and will be called last within the generated [`NetworkBehaviour`] implementation. -pub trait NetworkBehaviour: Send + 'static { +pub trait NetworkBehaviour: 'static { /// Handler for all the protocols the network behaviour supports. type ConnectionHandler: IntoConnectionHandler;