Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: promote futures to workspace dependency #5329

Merged
merged 3 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
unsigned-varint = { version = "0.8.0" }
tokio = { version = "1.37", default-features = false }
tracing = "0.1.37"
futures = "0.3.30"

[patch.crates-io]

Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
either = "1.11"
fnv = "1.0"
futures = { version = "0.3.30", features = ["executor", "thread-pool"] }
futures = { workspace = true, features = ["executor", "thread-pool"] }
futures-timer = "3"
instant = "0.1.12"
libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/autonat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ release = false
[dependencies]
tokio = { workspace = true, features = ["full"] }
clap = { version = "4.5.4", features = ["derive"] }
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-webrtc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ crate-type = ["cdylib"]

[dependencies]
anyhow = "1.0.82"
futures = "0.3.30"
futures = { workspace = true }
rand = "0.8"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/chat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ release = false
[dependencies]
tokio = { workspace = true, features = ["full"] }
async-trait = "0.1"
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "mdns", "noise", "macros", "tcp", "yamux", "quic"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/dcutr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ release = false

[dependencies]
clap = { version = "4.5.4", features = ["derive"] }
futures = "0.3.30"
futures = { workspace = true }
futures-timer = "3.0"
libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion examples/distributed-key-value-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ release = false
[dependencies]
async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = [ "async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "yamux"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/file-sharing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ release = false
serde = { version = "1.0", features = ["derive"] }
tokio = { workspace = true, features = ["full"] }
clap = { version = "4.5.4", features = ["derive"] }
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = [ "tokio", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/identify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ release = false
[dependencies]
async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = ["async-std", "dns", "dcutr", "identify", "macros", "noise", "ping", "relay", "rendezvous", "tcp", "tokio","yamux"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-kad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
async-trait = "0.1"
clap = { version = "4.5.4", features = ["derive"] }
env_logger = "0.10"
futures = "0.3.30"
futures = { workspace = true }
anyhow = "1.0.82"
libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
tracing = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-private/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ release = false
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] }
async-trait = "0.1"
either = "1.11"
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = [ "tokio", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "MIT"
release = false

[dependencies]
futures = "0.3.30"
futures = { workspace = true }
axum = "0.7"
libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
opentelemetry = { version = "0.22.0", features = ["metrics"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/ping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "MIT"
release = false

[dependencies]
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = ["noise", "ping", "tcp", "tokio", "yamux"] }
tokio = { workspace = true, features = ["full"] }
tracing = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/relay-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ release = false
clap = { version = "4.5.4", features = ["derive"] }
async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = [ "async-std", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/rendezvous/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ release = false
[dependencies]
async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = [ "async-std", "identify", "macros", "noise", "ping", "rendezvous", "tcp", "tokio", "yamux"] }
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time"] }
tracing = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ release = false

[dependencies]
anyhow = "1"
futures = "0.3.29"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = [ "tokio", "quic"] }
libp2p-stream = { path = "../../protocols/stream", version = "0.1.0-alpha" }
rand = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion examples/upnp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ release = false

[dependencies]
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../../libp2p", features = ["tokio", "dns", "macros", "noise", "ping", "tcp", "yamux", "upnp"] }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

Expand Down
2 changes: 1 addition & 1 deletion hole-punching-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT"
[dependencies]
anyhow = "1"
env_logger = "0.10.2"
futures = "0.3.30"
futures = { workspace = true }
libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
tracing = { workspace = true }
redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
Expand Down
2 changes: 1 addition & 1 deletion interop-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
anyhow = "1"
either = "1.11.0"
futures = "0.3.30"
futures = { workspace = true }
rand = "0.8.5"
serde = { version = "1", features = ["derive"] }
tracing = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion libp2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ upnp = ["dep:libp2p-upnp"]
[dependencies]
bytes = "1"
either = "1.9.0"
futures = "0.3.26"
futures = { workspace = true }
futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature
getrandom = "0.2.3" # Explicit dependency to be used in `wasm-bindgen` feature
instant = "0.1.12" # Explicit dependency to be used in `wasm-bindgen` feature
Expand Down
2 changes: 1 addition & 1 deletion misc/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ping = ["libp2p-ping"]
relay = ["libp2p-relay"]

[dependencies]
futures = "0.3.30"
futures = { workspace = true }
instant = "0.1.12"
libp2p-core = { workspace = true }
libp2p-dcutr = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion misc/multistream-select/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
bytes = "1"
futures = "0.3"
futures = { workspace = true }
tracing = { workspace = true }
pin-project = "1.1.5"
smallvec = "1.13.2"
Expand Down
2 changes: 1 addition & 1 deletion misc/quick-protobuf-codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ quick-protobuf = "0.8"

[dev-dependencies]
criterion = "0.5.1"
futures = "0.3.30"
futures = { workspace = true }
quickcheck = { workspace = true }

[[bench]]
Expand Down
2 changes: 1 addition & 1 deletion misc/rw-stream-sink/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["networking"]
categories = ["network-programming", "asynchronous"]

[dependencies]
futures = "0.3.30"
futures = { workspace = true }
pin-project = "1.1.5"
static_assertions = "1"

Expand Down
2 changes: 1 addition & 1 deletion misc/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license = "MIT"
[dependencies]
base64 = "0.22"
clap = { version = "4.5.4", features = ["derive"] }
futures = "0.3"
futures = { workspace = true }
futures-timer = "3"
axum = "0.7"
libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic", "websocket"] }
Expand Down
2 changes: 1 addition & 1 deletion misc/webrtc-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = true
[dependencies]
asynchronous-codec = { workspace = true }
bytes = "1"
futures = "0.3"
futures = { workspace = true }
hex = "0.4"
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions muxers/mplex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
bytes = "1"
futures = "0.3.30"
futures = { workspace = true }
asynchronous-codec = { workspace = true }
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
Expand All @@ -26,7 +26,7 @@ unsigned-varint = { workspace = true, features = ["asynchronous_codec"] }
[dev-dependencies]
async-std = { version = "1.7.0", features = ["attributes"] }
criterion = "0.5"
futures = "0.3"
futures = { workspace = true }
libp2p-identity = { workspace = true, features = ["rand"] }
libp2p-muxer-test-harness = { path = "../test-harness" }
libp2p-plaintext = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion muxers/test-harness/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ release = false

[dependencies]
libp2p-core = { workspace = true }
futures = "0.3.30"
futures = { workspace = true }
futures-timer = "3.0.3"
futures_ringbuf = "0.4.0"
tracing = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion muxers/yamux/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
either = "1"
futures = "0.3.30"
futures = { workspace = true }
libp2p-core = { workspace = true }
thiserror = "1.0"
yamux012 = { version = "0.12.1", package = "yamux" }
Expand Down
2 changes: 1 addition & 1 deletion protocols/autonat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
async-trait = "0.1"
futures = "0.3"
futures = { workspace = true }
futures-timer = "3.0"
instant = "0.1"
libp2p-core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/dcutr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
asynchronous-codec = { workspace = true }
either = "1.11.0"
futures = "0.3.30"
futures = { workspace = true }
futures-timer = "3.0"
instant = "0.1.12"
libp2p-core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/floodsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ asynchronous-codec = { workspace = true }
cuckoofilter = "0.5.0"
fnv = "1.0"
bytes = "1.6"
futures = "0.3.30"
futures = { workspace = true }
libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
libp2p-identity = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/gossipsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ byteorder = "1.5.0"
bytes = "1.6"
either = "1.11"
fnv = "1.0.7"
futures = "0.3.30"
futures = { workspace = true }
futures-ticker = "0.0.3"
getrandom = "0.2.14"
hex_fmt = "0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion protocols/identify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
asynchronous-codec = { workspace = true }
futures = "0.3.30"
futures = { workspace = true }
futures-timer = "3.0.3"
futures-bounded = { workspace = true }
libp2p-core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/kad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bytes = "1"
either = "1.11"
fnv = "1.0"
asynchronous-codec = { workspace = true }
futures = "0.3.30"
futures = { workspace = true }
libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
futures-bounded = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/mdns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
async-std = { version = "1.12.0", optional = true }
async-io = { version = "2.3.2", optional = true }
data-encoding = "2.5.0"
futures = "0.3.30"
futures = { workspace = true }
if-watch = "3.2.0"
libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/perf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
anyhow = "1"
clap = { version = "4.5.4", features = ["derive"] }
futures = "0.3.30"
futures = { workspace = true }
futures-bounded = { workspace = true }
futures-timer = "3.0"
instant = "0.1.12"
Expand Down
2 changes: 1 addition & 1 deletion protocols/ping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
either = "1.11.0"
futures = "0.3.30"
futures = { workspace = true }
futures-timer = "3.0.3"
instant = "0.1.12"
libp2p-core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/relay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
asynchronous-codec = { workspace = true }
bytes = "1"
either = "1.11.0"
futures = "0.3.30"
futures = { workspace = true }
futures-timer = "3"
futures-bounded = { workspace = true }
instant = "0.1.12"
Expand Down
2 changes: 1 addition & 1 deletion protocols/rendezvous/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
asynchronous-codec = { workspace = true }
async-trait = "0.1"
bimap = "0.6.3"
futures = { version = "0.3", default-features = false, features = ["std"] }
futures = { workspace = true, default-features = false, features = ["std"] }
futures-timer = "3.0.3"
instant = "0.1.12"
libp2p-core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/request-response/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
async-trait = "0.1"
cbor4ii = { version = "0.3.2", features = ["serde1", "use_std"], optional = true }
futures = "0.3.30"
futures = { workspace = true }
instant = "0.1.12"
libp2p-core = { workspace = true }
libp2p-swarm = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
categories = ["network-programming", "asynchronous"]

[dependencies]
futures = "0.3.29"
futures = { workspace = true }
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true, features = ["peerid"] }
libp2p-swarm = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/upnp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ categories = ["network-programming", "asynchronous"]
publish = true

[dependencies]
futures = "0.3.30"
futures = { workspace = true }
futures-timer = "3.0.3"
igd-next = "0.14.3"
libp2p-core = { workspace = true }
Expand Down
Loading
Loading