feat(libp2p-swarm-test): Support tokio

swarm-test/CHANGELOG.md

@@ -1,7 +1,12 @@
+## 0.4.1
+
+- Add `tokio` support.
+
 ## 0.4.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
 
+
 ## 0.3.0
 
 

swarm-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-swarm-test"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 rust-version = { workspace = true }
 license = "MIT"
@@ -16,8 +16,8 @@ async-trait = "0.1.80"
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-plaintext = { workspace = true }
-libp2p-swarm = { workspace = true, features = ["async-std"] }
-libp2p-tcp = { workspace = true, features = ["async-io"] }
+libp2p-swarm = { workspace = true }
+libp2p-tcp = { workspace = true }
 libp2p-yamux = { workspace = true }
 futures = { workspace = true }
 rand = "0.8.5"
@@ -26,3 +26,8 @@ futures-timer = "3.0.3"
 
 [lints]
 workspace = true
+
+[features]
+default = ["async-std"]
+async-std = ["libp2p-swarm/async-std", "libp2p-tcp/async-io"]
+tokio = ["libp2p-swarm/tokio", "libp2p-tcp/tokio"]

swarm-test/src/lib.rs

@@ -207,21 +207,30 @@
         let identity = Keypair::generate_ed25519();
         let peer_id = PeerId::from(identity.public());
 
+        #[cfg(feature = "async-std")]
+        let fallback_transport = libp2p_tcp::async_io::Transport::default();
+
+        #[cfg(feature = "tokio")]
+        let fallback_transport = libp2p_tcp::tokio::Transport::default();
+
         let transport = MemoryTransport::default()
-            .or_transport(libp2p_tcp::async_io::Transport::default())
+            .or_transport(fallback_transport)
             .upgrade(Version::V1)
             .authenticate(plaintext::Config::new(&identity))
             .multiplex(yamux::Config::default())
             .timeout(Duration::from_secs(20))
             .boxed();
 
-        Swarm::new(
-            transport,
-            behaviour_fn(identity),
-            peer_id,
-            swarm::Config::with_async_std_executor()
-                .with_idle_connection_timeout(Duration::from_secs(5)), // Some tests need connections to be kept alive beyond what the individual behaviour configures.,
-        )
+        #[cfg(feature = "async-std")]
+        let mut config = swarm::Config::with_async_std_executor();
+
+        #[cfg(feature = "tokio")]
+        let mut config = swarm::Config::with_tokio_executor();
+
+        // Some tests need connections to be kept alive beyond what the individual behaviour configures.
+        config = config.with_idle_connection_timeout(Duration::from_secs(5));
+
+        Swarm::new(transport, behaviour_fn(identity), peer_id, config)
     }
 
     async fn connect<T>(&mut self, other: &mut Swarm<T>)