Skip to content

chore(test-utils): revert #5725 #5810

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.

Sign up for GitHub

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

Merged
mergify merged 3 commits into from
Jan 13, 2025
Merged

chore(test-utils): revert #5725 #5810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b514cb
chore(swarm): remove unused test-utils crate from dev dependencies
jxs Jan 13, 2025
af07278
chore(test-utils): revert #5725, with it we cannot publish the crates…
jxs Jan 13, 2025
0fdbdb0
update Cargo.lock
jxs Jan 13, 2025
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
44 changes: 18 additions & 26 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion misc/multistream-select/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions misc/multistream-select/src/dialer_select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 0 additions & 4 deletions misc/test-utils/CHANGELOG.md
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions misc/test-utils/Cargo.toml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions misc/test-utils/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion muxers/mplex/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading