Skip to content

chore: replace async-std with tokio in autonat tests #5671

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
merged 2 commits into from
Nov 18, 2024
Merged

chore: replace async-std with tokio in autonat tests #5671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cf36ac
replace async-std with tokio in autonat tests
kamuik16 Nov 11, 2024
6a06189
Merge branch 'master' into autonat
kamuik16 Nov 15, 2024
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

11 changes: 7 additions & 4 deletions protocols/autonat/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ edition = "2021"
rust-version = { workspace = true }
description = "NAT and firewall detection for libp2p"
version = "0.13.1"
authors = ["David Craven <[email protected]>", "Elena Frank <[email protected]>", "Hannes Furmans <[email protected]>"]
authors = [
"David Craven <[email protected]>",
"Elena Frank <[email protected]>",
"Hannes Furmans <[email protected]>",
]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
keywords = ["peer-to-peer", "libp2p", "networking"]
Expand Down Expand Up @@ -32,12 +36,11 @@ rand_core = { version = "0.6", optional = true }
thiserror = { version = "1.0.52", optional = true }

[dev-dependencies]
tokio = { version = "1", features = ["macros", "rt", "sync"]}
async-std = { version = "1.10", features = ["attributes"] }
tokio = { workspace = true, features = ["macros", "rt", "sync"] }
libp2p-swarm-test = { path = "../../swarm-test" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
libp2p-identify = { workspace = true }
libp2p-swarm = { workspace = true, features = ["macros"]}
libp2p-swarm = { workspace = true, features = ["macros"] }

[features]
default = ["v1", "v2"]
Expand Down
18 changes: 9 additions & 9 deletions protocols/autonat/tests/test_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.

use async_std::task::JoinHandle;
use libp2p_autonat::{
Behaviour, Config, Event, NatStatus, OutboundProbeError, OutboundProbeEvent, ResponseError,
};
Expand All @@ -27,12 +26,13 @@ use libp2p_identity::PeerId;
use libp2p_swarm::{Swarm, SwarmEvent};
use libp2p_swarm_test::SwarmExt as _;
use std::time::Duration;
use tokio::task::JoinHandle;

const MAX_CONFIDENCE: usize = 3;
const TEST_RETRY_INTERVAL: Duration = Duration::from_secs(1);
const TEST_REFRESH_INTERVAL: Duration = Duration::from_secs(2);

#[async_std::test]
#[tokio::test]
async fn test_auto_probe() {
let mut client = Swarm::new_ephemeral(|key| {
Behaviour::new(
Expand Down Expand Up @@ -133,7 +133,7 @@ async fn test_auto_probe() {
assert!(client.behaviour().public_address().is_some());
}

#[async_std::test]
#[tokio::test]
async fn test_confidence() {
let mut client = Swarm::new_ephemeral(|key| {
Behaviour::new(
Expand Down Expand Up @@ -217,7 +217,7 @@ async fn test_confidence() {
}
}

#[async_std::test]
#[tokio::test]
async fn test_throttle_server_period() {
let mut client = Swarm::new_ephemeral(|key| {
Behaviour::new(
Expand Down Expand Up @@ -268,7 +268,7 @@ async fn test_throttle_server_period() {
assert_eq!(client.behaviour().confidence(), 0);
}

#[async_std::test]
#[tokio::test]
async fn test_use_connected_as_server() {
let mut client = Swarm::new_ephemeral(|key| {
Behaviour::new(
Expand Down Expand Up @@ -306,7 +306,7 @@ async fn test_use_connected_as_server() {
}
}

#[async_std::test]
#[tokio::test]
async fn test_outbound_failure() {
let mut client = Swarm::new_ephemeral(|key| {
Behaviour::new(
Expand Down Expand Up @@ -351,7 +351,7 @@ async fn test_outbound_failure() {
let mut inactive_servers = Vec::new();

for (id, handle) in servers.split_off(1) {
handle.cancel().await;
handle.abort();
inactive_servers.push(id);
}

Expand All @@ -375,7 +375,7 @@ async fn test_outbound_failure() {
}
}

#[async_std::test]
#[tokio::test]
async fn test_global_ips_config() {
let mut client = Swarm::new_ephemeral(|key| {
Behaviour::new(
Expand Down Expand Up @@ -426,7 +426,7 @@ async fn new_server_swarm() -> (PeerId, Multiaddr, JoinHandle<()>) {
let (_, multiaddr) = swarm.listen().await;
let peer_id = *swarm.local_peer_id();

let task = async_std::task::spawn(swarm.loop_on_next());
let task = tokio::spawn(swarm.loop_on_next());

(peer_id, multiaddr, task)
}
24 changes: 12 additions & 12 deletions protocols/autonat/tests/test_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ use libp2p_swarm::{Swarm, SwarmEvent};
use libp2p_swarm_test::SwarmExt as _;
use std::{num::NonZeroU32, time::Duration};

#[async_std::test]
#[tokio::test]
async fn test_dial_back() {
let (mut server, server_id, server_addr) = new_server_swarm(None).await;
let (mut client, client_id) = new_client_swarm(server_id, server_addr).await;
let (_, client_addr) = client.listen().await;
async_std::task::spawn(client.loop_on_next());
tokio::spawn(client.loop_on_next());

let client_port = client_addr
.into_iter()
Expand Down Expand Up @@ -128,14 +128,14 @@ async fn test_dial_back() {
}
}

#[async_std::test]
#[tokio::test]
async fn test_dial_error() {
let (mut server, server_id, server_addr) = new_server_swarm(None).await;
let (mut client, client_id) = new_client_swarm(server_id, server_addr).await;
client
.behaviour_mut()
.probe_address("/ip4/127.0.0.1/tcp/12345".parse().unwrap());
async_std::task::spawn(client.loop_on_next());
tokio::spawn(client.loop_on_next());

let request_probe_id = match server.next_behaviour_event().await {
Event::InboundProbe(InboundProbeEvent::Request { peer, probe_id, .. }) => {
Expand Down Expand Up @@ -178,7 +178,7 @@ async fn test_dial_error() {
}
}

#[async_std::test]
#[tokio::test]
async fn test_throttle_global_max() {
let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
throttle_clients_global_max: 1,
Expand All @@ -190,7 +190,7 @@ async fn test_throttle_global_max() {
for _ in 0..2 {
let (mut client, _) = new_client_swarm(server_id, server_addr.clone()).await;
client.listen().await;
async_std::task::spawn(client.loop_on_next());
tokio::spawn(client.loop_on_next());
}

let (first_probe_id, first_peer_id) = match server.next_behaviour_event().await {
Expand Down Expand Up @@ -218,7 +218,7 @@ async fn test_throttle_global_max() {
}
}

#[async_std::test]
#[tokio::test]
async fn test_throttle_peer_max() {
let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
throttle_clients_peer_max: 1,
Expand All @@ -230,7 +230,7 @@ async fn test_throttle_peer_max() {

let (mut client, client_id) = new_client_swarm(server_id, server_addr.clone()).await;
client.listen().await;
async_std::task::spawn(client.loop_on_next());
tokio::spawn(client.loop_on_next());

let first_probe_id = match server.next_behaviour_event().await {
Event::InboundProbe(InboundProbeEvent::Request { peer, probe_id, .. }) => {
Expand Down Expand Up @@ -265,7 +265,7 @@ async fn test_throttle_peer_max() {
};
}

#[async_std::test]
#[tokio::test]
async fn test_dial_multiple_addr() {
let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
throttle_clients_peer_max: 1,
Expand All @@ -280,7 +280,7 @@ async fn test_dial_multiple_addr() {
client
.behaviour_mut()
.probe_address("/ip4/127.0.0.1/tcp/12345".parse().unwrap());
async_std::task::spawn(client.loop_on_next());
tokio::spawn(client.loop_on_next());

let dial_addresses = match server.next_behaviour_event().await {
Event::InboundProbe(InboundProbeEvent::Request {
Expand Down Expand Up @@ -327,7 +327,7 @@ async fn test_dial_multiple_addr() {
}
}

#[async_std::test]
#[tokio::test]
async fn test_global_ips_config() {
let (mut server, server_id, server_addr) = new_server_swarm(Some(Config {
// Enforce that only clients outside of the local network are qualified for dial-backs.
Expand All @@ -338,7 +338,7 @@ async fn test_global_ips_config() {

let (mut client, _) = new_client_swarm(server_id, server_addr.clone()).await;
client.listen().await;
async_std::task::spawn(client.loop_on_next());
tokio::spawn(client.loop_on_next());

// Expect the probe to be refused as both peers run on the same machine and thus in the same local network.
match server.next_behaviour_event().await {
Expand Down