feat: remove Send bound from NetworkBehaviour

libp2p · Feb 24, 2022 · 0c5fa28 · 0c5fa28
1 parent b185946
commit 0c5fa28
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/protocols/dcutr/tests/lib.rs b/protocols/dcutr/tests/lib.rs
@@ -175,7 +175,7 @@ impl From<dcutr::behaviour::Event> for ClientEvent {
     }
 }
 
-fn spawn_swarm_on_pool<B: NetworkBehaviour>(pool: &LocalPool, swarm: Swarm<B>) {
+fn spawn_swarm_on_pool<B: NetworkBehaviour + Send>(pool: &LocalPool, swarm: Swarm<B>) {
     pool.spawner()
         .spawn_obj(swarm.collect::<Vec<_>>().map(|_| ()).boxed().into())
         .unwrap();

diff --git a/protocols/relay/tests/v1.rs b/protocols/relay/tests/v1.rs
@@ -1369,7 +1369,7 @@ fn build_keep_alive_only_swarm() -> Swarm<DummyBehaviour> {
     )
 }
 
-fn spawn_swarm_on_pool<B: NetworkBehaviour>(pool: &LocalPool, mut swarm: Swarm<B>) {
+fn spawn_swarm_on_pool<B: NetworkBehaviour + Send>(pool: &LocalPool, mut swarm: Swarm<B>) {
     pool.spawner()
         .spawn_obj(
             async move {

diff --git a/protocols/relay/tests/v2.rs b/protocols/relay/tests/v2.rs
@@ -397,7 +397,7 @@ impl From<PingEvent> for ClientEvent {
     }
 }
 
-fn spawn_swarm_on_pool<B: NetworkBehaviour>(pool: &LocalPool, swarm: Swarm<B>) {
+fn spawn_swarm_on_pool<B: NetworkBehaviour + Send>(pool: &LocalPool, swarm: Swarm<B>) {
     pool.spawner()
         .spawn_obj(swarm.collect::<Vec<_>>().map(|_| ()).boxed().into())
         .unwrap();

diff --git a/protocols/rendezvous/tests/harness.rs b/protocols/rendezvous/tests/harness.rs
@@ -140,7 +140,7 @@ pub trait SwarmExt {
     /// Establishes a connection to the given [`Swarm`], polling both of them until the connection is established.
     async fn block_on_connection<T>(&mut self, other: &mut Swarm<T>)
     where
-        T: NetworkBehaviour,
+        T: NetworkBehaviour + Send,
         <T as NetworkBehaviour>::OutEvent: Debug;
 
     /// Listens on a random memory address, polling the [`Swarm`] until the transport is ready to accept connections.
@@ -153,12 +153,12 @@ pub trait SwarmExt {
 #[async_trait]
 impl<B> SwarmExt for Swarm<B>
 where
-    B: NetworkBehaviour,
+    B: NetworkBehaviour + Send,
     <B as NetworkBehaviour>::OutEvent: Debug,
 {
     async fn block_on_connection<T>(&mut self, other: &mut Swarm<T>)
     where
-        T: NetworkBehaviour,
+        T: NetworkBehaviour + Send,
         <T as NetworkBehaviour>::OutEvent: Debug,
     {
         let addr_to_dial = other.external_addresses().next().unwrap().addr.clone();

diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
@@ -1,3 +1,8 @@
+
+# Unreleased
+
+- Remove `Send` bound from `NetworkBehaviour`.
+
 # 0.34.0 [2022-02-22]
 
 - Rename `ProtocolsHandler` to `ConnectionHandler`. Upgrade should be as simple as renaming all

diff --git a/swarm/src/behaviour.rs b/swarm/src/behaviour.rs
@@ -165,7 +165,7 @@ pub(crate) type THandlerOutEvent<THandler> =
 /// Optionally one can provide a custom `poll` function through the `#[behaviour(poll_method =
 /// "poll")]` attribute. This function must have the same signature as the [`NetworkBehaviour#poll`]
 /// function and will be called last within the generated [`NetworkBehaviour`] implementation.
-pub trait NetworkBehaviour: Send + 'static {
+pub trait NetworkBehaviour: 'static {
     /// Handler for all the protocols the network behaviour supports.
     type ConnectionHandler: IntoConnectionHandler;