Skip to content

Commit e2fcc47

Browse files
dignifiedquiremxinden
dignifiedquire
and
mxinden
authored
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 <[email protected]>
1 parent 99855b1 commit e2fcc47

33 files changed

+134
-53
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,21 @@
4242

4343
# `libp2p` facade crate
4444

45+
## 0.44.0 [unreleased]
46+
47+
- Update individual crates.
48+
- Update to [`libp2p-dcutr` `v0.2.0`](protocols/dcutr/CHANGELOG.md).
49+
- Update to [`libp2p-rendezvous` `v0.5.0`](protocols/rendezvous/CHANGELOG.md).
50+
- Update to [`libp2p-ping` `v0.35.0`](protocols/ping/CHANGELOG.md).
51+
- Update to [`libp2p-identify` `v0.35.0`](protocols/identify/CHANGELOG.md).
52+
- Update to [`libp2p-floodsub` `v0.35.0`](protocols/floodsub/CHANGELOG.md).
53+
- Update to [`libp2p-relay` `v0.8.0`](protocols/relay/CHANGELOG.md).
54+
- Update to [`libp2p-metrics` `v0.5.0`](misc/metrics/CHANGELOG.md).
55+
- Update to [`libp2p-kad` `v0.36.0`](protocols/kad/CHANGELOG.md).
56+
- Update to [`libp2p-autonat` `v0.3.0`](protocols/autonat/CHANGELOG.md).
57+
- Update to [`libp2p-request-response` `v0.17.0`](protocols/request-response/CHANGELOG.md).
58+
- Update to [`libp2p-swarm` `v0.35.0`](swarm/CHANGELOG.md).
59+
4560
## Version 0.43.0 [2022-02-22]
4661

4762
- Update individual crates.

‎Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Peer-to-peer networking library"
6-
version = "0.43.0"
6+
version = "0.44.0"
77
authors = ["Parity Technologies <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -77,22 +77,22 @@ getrandom = "0.2.3" # Explicit dependency to be used in `wasm-bindgen` feature
7777
instant = "0.1.11" # Explicit dependency to be used in `wasm-bindgen` feature
7878
lazy_static = "1.2"
7979

80-
libp2p-autonat = { version = "0.2.0", path = "protocols/autonat", optional = true }
80+
libp2p-autonat = { version = "0.3.0", path = "protocols/autonat", optional = true }
8181
libp2p-core = { version = "0.32.0", path = "core", default-features = false }
82-
libp2p-dcutr = { version = "0.1.0", path = "protocols/dcutr", optional = true }
83-
libp2p-floodsub = { version = "0.34.0", path = "protocols/floodsub", optional = true }
84-
libp2p-identify = { version = "0.34.0", path = "protocols/identify", optional = true }
85-
libp2p-kad = { version = "0.35.0", path = "protocols/kad", optional = true }
86-
libp2p-metrics = { version = "0.4.0", path = "misc/metrics", optional = true }
82+
libp2p-dcutr = { version = "0.2.0", path = "protocols/dcutr", optional = true }
83+
libp2p-floodsub = { version = "0.35.0", path = "protocols/floodsub", optional = true }
84+
libp2p-identify = { version = "0.35.0", path = "protocols/identify", optional = true }
85+
libp2p-kad = { version = "0.36.0", path = "protocols/kad", optional = true }
86+
libp2p-metrics = { version = "0.5.0", path = "misc/metrics", optional = true }
8787
libp2p-mplex = { version = "0.32.0", path = "muxers/mplex", optional = true }
8888
libp2p-noise = { version = "0.35.0", path = "transports/noise", optional = true }
89-
libp2p-ping = { version = "0.34.0", path = "protocols/ping", optional = true }
89+
libp2p-ping = { version = "0.35.0", path = "protocols/ping", optional = true }
9090
libp2p-plaintext = { version = "0.32.0", path = "transports/plaintext", optional = true }
9191
libp2p-pnet = { version = "0.22.0", path = "transports/pnet", optional = true }
92-
libp2p-relay = { version = "0.7.0", path = "protocols/relay", optional = true }
93-
libp2p-rendezvous = { version = "0.4.0", path = "protocols/rendezvous", optional = true }
94-
libp2p-request-response = { version = "0.16.0", path = "protocols/request-response", optional = true }
95-
libp2p-swarm = { version = "0.34.0", path = "swarm" }
92+
libp2p-relay = { version = "0.8.0", path = "protocols/relay", optional = true }
93+
libp2p-rendezvous = { version = "0.5.0", path = "protocols/rendezvous", optional = true }
94+
libp2p-request-response = { version = "0.17.0", path = "protocols/request-response", optional = true }
95+
libp2p-swarm = { version = "0.35.0", path = "swarm" }
9696
libp2p-swarm-derive = { version = "0.27.0", path = "swarm-derive" }
9797
libp2p-uds = { version = "0.32.0", path = "transports/uds", optional = true }
9898
libp2p-wasm-ext = { version = "0.32.0", path = "transports/wasm-ext", default-features = false, optional = true }
@@ -106,12 +106,12 @@ smallvec = "1.6.1"
106106
[target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
107107
libp2p-deflate = { version = "0.32.0", path = "transports/deflate", optional = true }
108108
libp2p-dns = { version = "0.32.0", path = "transports/dns", optional = true, default-features = false }
109-
libp2p-mdns = { version = "0.35.0", path = "protocols/mdns", optional = true }
109+
libp2p-mdns = { version = "0.36.0", path = "protocols/mdns", optional = true }
110110
libp2p-tcp = { version = "0.32.0", path = "transports/tcp", default-features = false, optional = true }
111111
libp2p-websocket = { version = "0.34.0", path = "transports/websocket", optional = true }
112112

113113
[target.'cfg(not(target_os = "unknown"))'.dependencies]
114-
libp2p-gossipsub = { version = "0.36.0", path = "protocols/gossipsub", optional = true }
114+
libp2p-gossipsub = { version = "0.37.0", path = "protocols/gossipsub", optional = true }
115115

116116
[dev-dependencies]
117117
async-std = { version = "1.6.2", features = ["attributes"] }

‎misc/metrics/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# 0.5.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
5+
- Update to `libp2p-dcutr` `v0.2.0`.
6+
7+
- Update to `libp2p-ping` `v0.35.0`.
8+
9+
- Update to `libp2p-identify` `v0.35.0`.
10+
11+
- Update to `libp2p-relay` `v0.8.0`.
12+
13+
- Update to `libp2p-kad` `v0.36.0`.
14+
115
# 0.4.0 [2022-02-22]
216

317
- Update to `libp2p-core` `v0.32.0`.

‎misc/metrics/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-metrics"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Metrics for libp2p"
6-
version = "0.4.0"
6+
version = "0.5.0"
77
authors = ["Max Inden <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -20,16 +20,16 @@ dcutr = ["libp2p-dcutr"]
2020

2121
[dependencies]
2222
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
23-
libp2p-dcutr = { version = "0.1.0", path = "../../protocols/dcutr", optional = true }
24-
libp2p-identify = { version = "0.34.0", path = "../../protocols/identify", optional = true }
25-
libp2p-kad = { version = "0.35.0", path = "../../protocols/kad", optional = true }
26-
libp2p-ping = { version = "0.34.0", path = "../../protocols/ping", optional = true }
27-
libp2p-relay = { version = "0.7.0", path = "../../protocols/relay", optional = true }
28-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
23+
libp2p-dcutr = { version = "0.2.0", path = "../../protocols/dcutr", optional = true }
24+
libp2p-identify = { version = "0.35.0", path = "../../protocols/identify", optional = true }
25+
libp2p-kad = { version = "0.36.0", path = "../../protocols/kad", optional = true }
26+
libp2p-ping = { version = "0.35.0", path = "../../protocols/ping", optional = true }
27+
libp2p-relay = { version = "0.8.0", path = "../../protocols/relay", optional = true }
28+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
2929
prometheus-client = "0.15.0"
3030

3131
[target.'cfg(not(target_os = "unknown"))'.dependencies]
32-
libp2p-gossipsub = { version = "0.36.0", path = "../../protocols/gossipsub", optional = true }
32+
libp2p-gossipsub = { version = "0.37.0", path = "../../protocols/gossipsub", optional = true }
3333

3434
[dev-dependencies]
3535
env_logger = "0.8.1"

‎protocols/autonat/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 0.3.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
5+
- Update to `libp2p-request-response` `v0.17.0`.
6+
17
# 0.2.0 [2022-02-22]
28

39
- Update to `libp2p-core` `v0.32.0`.

‎protocols/autonat/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-autonat"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "NAT and firewall detection for libp2p"
6-
version = "0.2.0"
6+
version = "0.3.0"
77
authors = ["David Craven <[email protected]>", "Elena Frank <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -19,8 +19,8 @@ futures = "0.3"
1919
futures-timer = "3.0"
2020
instant = "0.1"
2121
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
22-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
23-
libp2p-request-response = { version = "0.16.0", path = "../request-response" }
22+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
23+
libp2p-request-response = { version = "0.17.0", path = "../request-response" }
2424
log = "0.4"
2525
rand = "0.8"
2626
prost = "0.9"

‎protocols/dcutr/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.2.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.1.0 [2022-02-22]
26

37
- Initial release.

‎protocols/dcutr/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-dcutr"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Direct connection upgrade through relay"
6-
version = "0.1.0"
6+
version = "0.2.0"
77
authors = ["Max Inden <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -18,7 +18,7 @@ futures = "0.3.1"
1818
futures-timer = "3.0"
1919
instant = "0.1.11"
2020
libp2p-core = { version = "0.32", path = "../../core" }
21-
libp2p-swarm = { version = "0.34", path = "../../swarm" }
21+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
2222
log = "0.4"
2323
prost = "0.7"
2424
thiserror = "1.0"

‎protocols/dcutr/tests/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl From<dcutr::behaviour::Event> for ClientEvent {
175175
}
176176
}
177177

178-
fn spawn_swarm_on_pool<B: NetworkBehaviour>(pool: &LocalPool, swarm: Swarm<B>) {
178+
fn spawn_swarm_on_pool<B: NetworkBehaviour + Send>(pool: &LocalPool, swarm: Swarm<B>) {
179179
pool.spawner()
180180
.spawn_obj(swarm.collect::<Vec<_>>().map(|_| ()).boxed().into())
181181
.unwrap();

‎protocols/floodsub/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.35.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.34.0 [2022-02-22]
26

37
- Update to `libp2p-core` `v0.32.0`.

‎protocols/floodsub/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-floodsub"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Floodsub protocol for libp2p"
6-
version = "0.34.0"
6+
version = "0.35.0"
77
authors = ["Parity Technologies <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -15,7 +15,7 @@ cuckoofilter = "0.5.0"
1515
fnv = "1.0"
1616
futures = "0.3.1"
1717
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
18-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
18+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
1919
log = "0.4"
2020
prost = "0.9"
2121
rand = "0.7"

‎protocols/gossipsub/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.37.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.36.0 [2022-02-22]
26

37
- Update to `libp2p-core` `v0.32.0`.

‎protocols/gossipsub/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name = "libp2p-gossipsub"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Gossipsub protocol for libp2p"
6-
version = "0.36.0"
6+
version = "0.37.0"
77
authors = ["Age Manning <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
1010
keywords = ["peer-to-peer", "libp2p", "networking"]
1111
categories = ["network-programming", "asynchronous"]
1212

1313
[dependencies]
14-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
14+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
1515
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
1616
bytes = "1.0"
1717
byteorder = "1.3.4"

‎protocols/identify/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.35.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.34.0 [2022-02-22]
26

37
- Update to `libp2p-core` `v0.32.0`.

‎protocols/identify/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-identify"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Nodes identifcation protocol for libp2p"
6-
version = "0.34.0"
6+
version = "0.35.0"
77
authors = ["Parity Technologies <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
1414
futures = "0.3.1"
1515
futures-timer = "3.0.2"
1616
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
17-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
17+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
1818
log = "0.4.1"
1919
lru = "0.7.2"
2020
prost = "0.9"

‎protocols/kad/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.36.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.35.0 [2022-02-22]
26

37
- Update to `libp2p-core` `v0.32.0`.

‎protocols/kad/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-kad"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Kademlia protocol for libp2p"
6-
version = "0.35.0"
6+
version = "0.36.0"
77
authors = ["Parity Technologies <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -19,7 +19,7 @@ asynchronous-codec = "0.6"
1919
futures = "0.3.1"
2020
log = "0.4"
2121
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
22-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
22+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
2323
prost = "0.9"
2424
rand = "0.7.2"
2525
sha2 = "0.10.0"

‎protocols/mdns/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.36.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.35.0 [2022-02-22]
26

37
- Update to `libp2p-core` `v0.32.0`.

‎protocols/mdns/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "libp2p-mdns"
33
edition = "2021"
44
rust-version = "1.56.1"
5-
version = "0.35.0"
5+
version = "0.36.0"
66
description = "Implementation of the libp2p mDNS discovery method"
77
authors = ["Parity Technologies <[email protected]>"]
88
license = "MIT"
@@ -18,7 +18,7 @@ futures = "0.3.13"
1818
if-watch = "1.0.0"
1919
lazy_static = "1.4.0"
2020
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
21-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
21+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
2222
log = "0.4.14"
2323
rand = "0.8.3"
2424
smallvec = "1.6.1"

‎protocols/ping/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.35.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.34.0 [2022-02-22]
26

37
- Update to `libp2p-core` `v0.32.0`.

‎protocols/ping/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-ping"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Ping protocol for libp2p"
6-
version = "0.34.0"
6+
version = "0.35.0"
77
authors = ["Parity Technologies <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -15,7 +15,7 @@ futures = "0.3.1"
1515
futures-timer = "3.0.2"
1616
instant = "0.1.11"
1717
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
18-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
18+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
1919
log = "0.4.1"
2020
rand = "0.7.2"
2121
void = "1.0"

‎protocols/relay/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.8.0 [unreleased]
2+
3+
- Update to `libp2p-swarm` `v0.35.0`.
4+
15
# 0.7.0 [2022-02-22]
26

37
- Update to `libp2p-core` `v0.32.0`.

‎protocols/relay/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "libp2p-relay"
33
edition = "2021"
44
rust-version = "1.56.1"
55
description = "Communications relaying for libp2p"
6-
version = "0.7.0"
6+
version = "0.8.0"
77
authors = ["Parity Technologies <[email protected]>", "Max Inden <[email protected]>"]
88
license = "MIT"
99
repository = "https://github.com/libp2p/rust-libp2p"
@@ -18,7 +18,7 @@ futures = "0.3.1"
1818
futures-timer = "3"
1919
instant = "0.1.11"
2020
libp2p-core = { version = "0.32.0", path = "../../core", default-features = false }
21-
libp2p-swarm = { version = "0.34.0", path = "../../swarm" }
21+
libp2p-swarm = { version = "0.35.0", path = "../../swarm" }
2222
log = "0.4"
2323
pin-project = "1"
2424
prost = "0.9"

‎protocols/relay/tests/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ fn build_keep_alive_only_swarm() -> Swarm<DummyBehaviour> {
13691369
)
13701370
}
13711371

1372-
fn spawn_swarm_on_pool<B: NetworkBehaviour>(pool: &LocalPool, mut swarm: Swarm<B>) {
1372+
fn spawn_swarm_on_pool<B: NetworkBehaviour + Send>(pool: &LocalPool, mut swarm: Swarm<B>) {
13731373
pool.spawner()
13741374
.spawn_obj(
13751375
async move {

‎protocols/relay/tests/v2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ impl From<PingEvent> for ClientEvent {
397397
}
398398
}
399399

400-
fn spawn_swarm_on_pool<B: NetworkBehaviour>(pool: &LocalPool, swarm: Swarm<B>) {
400+
fn spawn_swarm_on_pool<B: NetworkBehaviour + Send>(pool: &LocalPool, swarm: Swarm<B>) {
401401
pool.spawner()
402402
.spawn_obj(swarm.collect::<Vec<_>>().map(|_| ()).boxed().into())
403403
.unwrap();

0 commit comments

Comments
 (0)