Skip to content

Commit 00e0d29

Browse files
authored
chore(websocket): migrate test from async-std to tokio
migrate from async-std to tokio, asked before [here](#5955 (comment)) Pull-Request: #6054.
1 parent 547fc37 commit 00e0d29

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

transports/websocket/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ url = "2.5"
2626
webpki-roots = "0.26"
2727

2828
[dev-dependencies]
29-
libp2p-tcp = { workspace = true, features = ["async-io"] }
29+
libp2p-tcp = { workspace = true, features = ["tokio"] }
3030
libp2p-dns = { workspace = true, features = ["tokio"] }
3131
libp2p-identity = { workspace = true, features = ["rand"] }
3232
tokio = { workspace = true, features = ["rt", "macros", "io-std", "io-util"] }

transports/websocket/src/lib.rs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ use rw_stream_sink::RwStreamSink;
7676
/// # async fn main() {
7777
///
7878
/// let mut transport = websocket::Config::new(
79-
/// dns::tokio::Transport::system(tcp::async_io::Transport::new(tcp::Config::default()))
80-
/// .unwrap(),
79+
/// dns::tokio::Transport::system(tcp::tokio::Transport::new(tcp::Config::default())).unwrap(),
8180
/// );
8281
///
8382
/// let rcgen::CertifiedKey {
@@ -117,8 +116,7 @@ use rw_stream_sink::RwStreamSink;
117116
/// # #[tokio::main]
118117
/// # async fn main() {
119118
///
120-
/// let mut transport =
121-
/// websocket::Config::new(tcp::async_io::Transport::new(tcp::Config::default()));
119+
/// let mut transport = websocket::Config::new(tcp::tokio::Transport::new(tcp::Config::default()));
122120
///
123121
/// let id = transport
124122
/// .listen_on(
@@ -315,20 +313,20 @@ mod tests {
315313

316314
use super::Config;
317315

318-
#[test]
319-
fn dialer_connects_to_listener_ipv4() {
316+
#[tokio::test]
317+
async fn dialer_connects_to_listener_ipv4() {
320318
let a = "/ip4/127.0.0.1/tcp/0/ws".parse().unwrap();
321-
futures::executor::block_on(connect(a))
319+
connect(a).await
322320
}
323321

324-
#[test]
325-
fn dialer_connects_to_listener_ipv6() {
322+
#[tokio::test]
323+
async fn dialer_connects_to_listener_ipv6() {
326324
let a = "/ip6/::1/tcp/0/ws".parse().unwrap();
327-
futures::executor::block_on(connect(a))
325+
connect(a).await
328326
}
329327

330-
fn new_ws_config() -> Config<tcp::async_io::Transport> {
331-
Config::new(tcp::async_io::Transport::new(tcp::Config::default()))
328+
fn new_ws_config() -> Config<tcp::tokio::Transport> {
329+
Config::new(tcp::tokio::Transport::new(tcp::Config::default()))
332330
}
333331

334332
async fn connect(listen_addr: Multiaddr) {

0 commit comments

Comments
 (0)