From 96a4036a0b4b403e8dfb21e1c37b253971d03144 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Tue, 20 Jun 2023 12:45:05 +0200 Subject: [PATCH] Don't use workspace inheritance for dev dependencies --- misc/allow-block-list/Cargo.toml | 4 ++-- misc/connection-limits/Cargo.toml | 4 ++-- muxers/mplex/Cargo.toml | 2 +- muxers/yamux/Cargo.toml | 2 +- protocols/autonat/Cargo.toml | 2 +- protocols/dcutr/Cargo.toml | 2 +- protocols/gossipsub/Cargo.toml | 2 +- protocols/mdns/Cargo.toml | 2 +- protocols/perf/Cargo.toml | 2 +- protocols/ping/Cargo.toml | 2 +- protocols/rendezvous/Cargo.toml | 2 +- protocols/request-response/Cargo.toml | 2 +- swarm/Cargo.toml | 2 +- transports/quic/Cargo.toml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml index 897087e3b0b..42a6f634272 100644 --- a/misc/allow-block-list/Cargo.toml +++ b/misc/allow-block-list/Cargo.toml @@ -17,5 +17,5 @@ void = "1" [dev-dependencies] async-std = { version = "1.12.0", features = ["attributes"] } -libp2p-swarm-derive = { workspace = true } -libp2p-swarm-test = { workspace = true } +libp2p-swarm-derive = { path = "../../swarm-derive" } +libp2p-swarm-test = { path = "../../swarm-test" } diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml index dfc5bdad5ab..db662f518aa 100644 --- a/misc/connection-limits/Cargo.toml +++ b/misc/connection-limits/Cargo.toml @@ -19,7 +19,7 @@ void = "1" async-std = { version = "1.12.0", features = ["attributes"] } libp2p-identify = { workspace = true } libp2p-ping = { workspace = true } -libp2p-swarm-derive = { workspace = true } -libp2p-swarm-test = { workspace = true } +libp2p-swarm-derive = { path = "../../swarm-derive" } +libp2p-swarm-test = { path = "../../swarm-test" } quickcheck = { workspace = true } rand = "0.8.5" diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml index ccc7482e52a..6e617482422 100644 --- a/muxers/mplex/Cargo.toml +++ b/muxers/mplex/Cargo.toml @@ -28,7 +28,7 @@ async-std = { version = "1.7.0", features = ["attributes"] } criterion = "0.5" env_logger = "0.10" futures = "0.3" -libp2p-muxer-test-harness = { workspace = true } +libp2p-muxer-test-harness = { path = "../test-harness" } libp2p-plaintext = { workspace = true } libp2p-tcp = { workspace = true, features = ["async-io"] } quickcheck = { workspace = true } diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml index 7a024e3af3b..50a9e97d1d0 100644 --- a/muxers/yamux/Cargo.toml +++ b/muxers/yamux/Cargo.toml @@ -19,7 +19,7 @@ log = "0.4" [dev-dependencies] async-std = { version = "1.7.0", features = ["attributes"] } -libp2p-muxer-test-harness = { workspace = true } +libp2p-muxer-test-harness = { path = "../test-harness" } # Passing arguments to the docsrs builder in order to properly document cfg's. # More information: https://docs.rs/about/builds#cross-compiling diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml index 27cfcde0758..4a8c9fe71d6 100644 --- a/protocols/autonat/Cargo.toml +++ b/protocols/autonat/Cargo.toml @@ -26,7 +26,7 @@ quick-protobuf = "0.8" [dev-dependencies] async-std = { version = "1.10", features = ["attributes"] } env_logger = "0.10" -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } # Passing arguments to the docsrs builder in order to properly document cfg's. # More information: https://docs.rs/about/builds#cross-compiling diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index 50c9bbc61ac..b3bda616cdb 100644 --- a/protocols/dcutr/Cargo.toml +++ b/protocols/dcutr/Cargo.toml @@ -36,7 +36,7 @@ libp2p-ping = { workspace = true } libp2p-plaintext = { workspace = true } libp2p-relay = { workspace = true } libp2p-swarm = { workspace = true, features = ["macros"] } -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } libp2p-tcp = { workspace = true, features = ["async-io"] } libp2p-yamux = { workspace = true } rand = "0.8" diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml index 9b7c82532ee..c0d59f113d9 100644 --- a/protocols/gossipsub/Cargo.toml +++ b/protocols/gossipsub/Cargo.toml @@ -49,7 +49,7 @@ hex = "0.4.2" libp2p-core = { workspace = true } libp2p-yamux = { workspace = true } libp2p-noise = { workspace = true } -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } quickcheck = { workspace = true } # Passing arguments to the docsrs builder in order to properly document cfg's. diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 5206fe9effe..cd7e658e418 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -38,7 +38,7 @@ libp2p-swarm = { workspace = true, features = ["tokio", "async-std"] } libp2p-tcp = { workspace = true, features = ["tokio", "async-io"] } libp2p-yamux = { workspace = true } tokio = { version = "1.28", default-features = false, features = ["macros", "rt", "rt-multi-thread", "time"] } -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } [[test]] name = "use-async-std" diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml index 2ce05a06940..a2d6e042883 100644 --- a/protocols/perf/Cargo.toml +++ b/protocols/perf/Cargo.toml @@ -35,7 +35,7 @@ void = "1" [dev-dependencies] rand = "0.8" -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } # Passing arguments to the docsrs builder in order to properly document cfg's. # More information: https://docs.rs/about/builds#cross-compiling diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml index 8a2dd90f428..aba62c3a2c0 100644 --- a/protocols/ping/Cargo.toml +++ b/protocols/ping/Cargo.toml @@ -26,7 +26,7 @@ void = "1.0" async-std = "1.6.2" env_logger = "0.10.0" libp2p-swarm = { workspace = true, features = ["macros"] } -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } quickcheck = { workspace = true } # Passing arguments to the docsrs builder in order to properly document cfg's. diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml index b1cf7db044d..8b973ad020e 100644 --- a/protocols/rendezvous/Cargo.toml +++ b/protocols/rendezvous/Cargo.toml @@ -38,7 +38,7 @@ libp2p-yamux = { workspace = true } libp2p-tcp = { workspace = true, features = ["tokio"] } rand = "0.8" tokio = { version = "1.28", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] } -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } # Passing arguments to the docsrs builder in order to properly document cfg's. # More information: https://docs.rs/about/builds#cross-compiling diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml index 2e19efcd864..fe51f2f3529 100644 --- a/protocols/request-response/Cargo.toml +++ b/protocols/request-response/Cargo.toml @@ -36,7 +36,7 @@ libp2p-noise = { workspace = true } libp2p-tcp = { workspace = true, features = ["async-io"] } libp2p-yamux = { workspace = true } rand = "0.8" -libp2p-swarm-test = { workspace = true } +libp2p-swarm-test = { path = "../../swarm-test" } futures_ringbuf = "0.4.0" serde = { version = "1.0", features = ["derive"]} diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml index 3437037196b..7fd189587de 100644 --- a/swarm/Cargo.toml +++ b/swarm/Cargo.toml @@ -48,7 +48,7 @@ libp2p-identity = { workspace = true, features = ["ed25519"] } libp2p-kad = { path = "../protocols/kad" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing. libp2p-ping = { path = "../protocols/ping" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing. libp2p-plaintext = { path = "../transports/plaintext" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing. -libp2p-swarm-derive = { workspace = true } +libp2p-swarm-derive = { path = "../swarm-derive" } libp2p-swarm-test = { path = "../swarm-test" } # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing. libp2p-yamux = { workspace = true } quickcheck = { workspace = true } diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 2005208c734..10be7b8aee4 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -39,7 +39,7 @@ rustc-args = ["--cfg", "docsrs"] [dev-dependencies] async-std = { version = "1.12.0", features = ["attributes"] } env_logger = "0.10.0" -libp2p-muxer-test-harness = { workspace = true } +libp2p-muxer-test-harness = { path = "../../muxers/test-harness" } libp2p-noise = { workspace = true } libp2p-tcp = { workspace = true, features = ["async-io"] } libp2p-yamux = { workspace = true }