From faf496f0ca964cadb1589803222f7f4d6502a123 Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Fri, 1 Dec 2023 09:36:17 +0200 Subject: [PATCH] Don't include `webrtc` into the `tokio` feature This works around a bug in cargo which unconditionally pulls the dependencies even if the `webrtc` feature is not enabled and causes issues in downstream with other conflicting dependencies. --- libp2p/CHANGELOG.md | 6 ++++++ libp2p/Cargo.toml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md index a76b7b45ce7..a48b9bb3143 100644 --- a/libp2p/CHANGELOG.md +++ b/libp2p/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.51.4 + +- Don't include `webrtc` into `tokio` by default [PR 4962]. + +[PR 4962]: https://github.com/libp2p/rust-libp2p/pull/4962 + ## 0.51.3 - Deprecate the `mplex` feature. diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml index f979366b71a..d36a4621678 100644 --- a/libp2p/Cargo.toml +++ b/libp2p/Cargo.toml @@ -80,12 +80,12 @@ secp256k1 = ["libp2p-identity/secp256k1"] serde = ["libp2p-core/serde", "libp2p-kad?/serde", "libp2p-gossipsub?/serde"] tcp = ["dep:libp2p-tcp"] tls = ["dep:libp2p-tls"] -tokio = ["libp2p-swarm/tokio", "libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio", "libp2p-quic?/tokio", "libp2p-webrtc?/tokio"] +tokio = ["libp2p-swarm/tokio", "libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio", "libp2p-quic?/tokio"] uds = ["dep:libp2p-uds"] wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js", "libp2p-swarm/wasm-bindgen"] wasm-ext = ["dep:libp2p-wasm-ext"] wasm-ext-websocket = ["wasm-ext", "libp2p-wasm-ext?/websocket"] -webrtc = ["dep:libp2p-webrtc", "libp2p-webrtc?/pem"] +webrtc = ["dep:libp2p-webrtc", "libp2p-webrtc?/pem", "libp2p-webrtc/tokio"] websocket = ["dep:libp2p-websocket"] yamux = ["dep:libp2p-yamux"]