chore(test-utils): revert #5725

We cannot publish the crates using `libp2p-test-utils`, as cargo seems to required `dev-dependencies` to also be published Pull-Request: #5810.
libp2p · Jan 13, 2025 · 0177ddf · 0177ddf
1 parent d57081f
commit 0177ddf
Show file tree

Hide file tree

Showing 53 changed files with 330 additions and 180 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,6 @@ members = [
     "misc/quickcheck-ext",
     "misc/rw-stream-sink",
     "misc/server",
-    "misc/test-utils",
     "misc/webrtc-utils",
     "muxers/mplex",
     "muxers/test-harness",
@@ -114,7 +113,6 @@ libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
 libp2p-webtransport-websys = { version = "0.4.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
-libp2p-test-utils = { version = "0.1.0", path = "misc/test-utils" }
 
 # External dependencies
 async-std-resolver = { version = "0.25.0-alpha.4", default-features = false }

diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
@@ -23,7 +23,7 @@ async-std = { version = "1.6.2", features = ["attributes"] }
 futures_ringbuf = "0.4.0"
 quickcheck = { workspace = true }
 rw-stream-sink = { workspace = true }
-libp2p-test-utils = { workspace = true }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 # 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/misc/multistream-select/src/dialer_select.rs b/misc/multistream-select/src/dialer_select.rs
@@ -214,9 +214,9 @@ mod tests {
         future::timeout,
         net::{TcpListener, TcpStream},
     };
-    use libp2p_test_utils::EnvFilter;
     use quickcheck::{Arbitrary, Gen, GenRange};
     use tracing::metadata::LevelFilter;
+    use tracing_subscriber::EnvFilter;
 
     use super::*;
     use crate::listener_select_proto;
@@ -275,11 +275,13 @@ mod tests {
             ListenerProtos(listen_protos): ListenerProtos,
             DialPayload(dial_payload): DialPayload,
         ) {
-            libp2p_test_utils::with_env_filter(
-                EnvFilter::builder()
-                    .with_default_directive(LevelFilter::DEBUG.into())
-                    .from_env_lossy(),
-            );
+            let _ = tracing_subscriber::fmt()
+                .with_env_filter(
+                    EnvFilter::builder()
+                        .with_default_directive(LevelFilter::DEBUG.into())
+                        .from_env_lossy(),
+                )
+                .try_init();
 
             async_std::task::block_on(async move {
                 let listener = TcpListener::bind("0.0.0.0:0").await.unwrap();

diff --git a/misc/test-utils/CHANGELOG.md b/misc/test-utils/CHANGELOG.md
diff --git a/misc/test-utils/Cargo.toml b/misc/test-utils/Cargo.toml
diff --git a/misc/test-utils/src/lib.rs b/misc/test-utils/src/lib.rs
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
@@ -32,7 +32,7 @@ libp2p-muxer-test-harness = { path = "../test-harness" }
 libp2p-plaintext = { workspace = true }
 libp2p-tcp = { workspace = true, features = ["async-io"] }
 quickcheck = { workspace = true }
-libp2p-test-utils = { workspace = true }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [[bench]]
 name = "split_send_size"