Skip to content

chore(request-reponse): use tokio test-swarm #6063

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 1 commit into from
Jun 18, 2025
Merged

chore(request-reponse): use tokio test-swarm #6063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion protocols/request-response/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cbor = ["dep:serde", "dep:cbor4ii", "libp2p-swarm/macros"]
anyhow = "1.0.86"
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
rand = "0.8"
libp2p-swarm-test = { path = "../../swarm-test", features = ["async-std"]}
libp2p-swarm-test = { path = "../../swarm-test" }
futures_ringbuf = "0.4.0"
serde = { version = "1.0", features = ["derive"] }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
Expand Down
5 changes: 3 additions & 2 deletions protocols/request-response/tests/error_reporting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,9 @@ fn new_swarm_with_config(
) -> (PeerId, Swarm<request_response::Behaviour<TestCodec>>) {
let protocols = iter::once((StreamProtocol::new("/test/1"), ProtocolSupport::Full));

let swarm =
Swarm::new_ephemeral(|_| request_response::Behaviour::<TestCodec>::new(protocols, cfg));
let swarm = Swarm::new_ephemeral_tokio(|_| {
request_response::Behaviour::<TestCodec>::new(protocols, cfg)
});
let peed_id = *swarm.local_peer_id();

(peed_id, swarm)
Expand Down
4 changes: 2 additions & 2 deletions protocols/request-response/tests/peer_address.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ async fn dial_succeeds_after_adding_peers_address() {
let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
let config = request_response::Config::default();

let mut swarm = Swarm::new_ephemeral(|_| {
let mut swarm = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), config.clone())
});

let mut swarm2 = Swarm::new_ephemeral(|_| {
let mut swarm2 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), config.clone())
});

Expand Down
22 changes: 11 additions & 11 deletions protocols/request-response/tests/ping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ async fn is_response_outbound() {
let ping = Ping("ping".to_string().into_bytes());
let offline_peer = PeerId::random();

let mut swarm1 = Swarm::new_ephemeral(|_| {
let mut swarm1 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(
[(StreamProtocol::new("/ping/1"), ProtocolSupport::Full)],
request_response::Config::default(),
Expand Down Expand Up @@ -90,11 +90,11 @@ async fn ping_protocol() {
let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
let cfg = request_response::Config::default();

let mut swarm1 = Swarm::new_ephemeral(|_| {
let mut swarm1 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), cfg.clone())
});
let peer1_id = *swarm1.local_peer_id();
let mut swarm2 = Swarm::new_ephemeral(|_| {
let mut swarm2 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols, cfg)
});
let peer2_id = *swarm2.local_peer_id();
Expand Down Expand Up @@ -187,11 +187,11 @@ async fn ping_protocol_explicit_address() {
let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
let cfg = request_response::Config::default();

let mut swarm1 = Swarm::new_ephemeral(|_| {
let mut swarm1 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), cfg.clone())
});
let peer1_id = *swarm1.local_peer_id();
let mut swarm2 = Swarm::new_ephemeral(|_| {
let mut swarm2 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols, cfg)
});
let peer2_id = *swarm2.local_peer_id();
Expand Down Expand Up @@ -305,11 +305,11 @@ async fn emits_inbound_connection_closed_failure() {
let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
let cfg = request_response::Config::default();

let mut swarm1 = Swarm::new_ephemeral(|_| {
let mut swarm1 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), cfg.clone())
});
let peer1_id = *swarm1.local_peer_id();
let mut swarm2 = Swarm::new_ephemeral(|_| {
let mut swarm2 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols, cfg)
});
let peer2_id = *swarm2.local_peer_id();
Expand Down Expand Up @@ -371,11 +371,11 @@ async fn emits_inbound_connection_closed_if_channel_is_dropped() {
let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
let cfg = request_response::Config::default();

let mut swarm1 = Swarm::new_ephemeral(|_| {
let mut swarm1 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), cfg.clone())
});
let peer1_id = *swarm1.local_peer_id();
let mut swarm2 = Swarm::new_ephemeral(|_| {
let mut swarm2 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols, cfg)
});
let peer2_id = *swarm2.local_peer_id();
Expand Down Expand Up @@ -432,11 +432,11 @@ async fn concurrent_ping_protocol() {
let protocols = iter::once((StreamProtocol::new("/ping/1"), ProtocolSupport::Full));
let cfg = request_response::Config::default();

let mut swarm1 = Swarm::new_ephemeral(|_| {
let mut swarm1 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols.clone(), cfg.clone())
});
let peer1_id = *swarm1.local_peer_id();
let mut swarm2 = Swarm::new_ephemeral(|_| {
let mut swarm2 = Swarm::new_ephemeral_tokio(|_| {
request_response::cbor::Behaviour::<Ping, Pong>::new(protocols, cfg)
});
let peer2_id = *swarm2.local_peer_id();
Expand Down
Loading