chore: Split futures dependencies (#40)

Author: oblique

Cargo.lock

@@ -12,8 +12,9 @@ blockstore = "0.4"
 bytes = "1"
 cid = "0.11"
 fnv = "1.0.5"
-futures = "0.3"
+futures-core = "0.3"
 futures-timer = "3"
+futures-util = "0.3"
 instant = "0.1.12"
 libp2p-core = "0.41"
 libp2p-identity = "0.2"

Cargo.toml

@@ -9,10 +9,10 @@ use asynchronous_codec::FramedWrite;
 use blockstore::{Blockstore, BlockstoreError};
 use cid::CidGeneric;
 use fnv::{FnvHashMap, FnvHashSet};
-use futures::future::{AbortHandle, Abortable};
-use futures::stream::FuturesUnordered;
-use futures::{FutureExt, SinkExt, StreamExt};
 use futures_timer::Delay;
+use futures_util::future::{AbortHandle, Abortable, FutureExt};
+use futures_util::sink::SinkExt;
+use futures_util::stream::{FuturesUnordered, StreamExt};
 use instant::Instant;
 use libp2p_core::upgrade::ReadyUpgrade;
 use libp2p_identity::PeerId;
@@ -698,7 +698,7 @@ mod tests {
     use crate::Behaviour;
     use asynchronous_codec::FramedRead;
     use blockstore::InMemoryBlockstore;
-    use futures::future::{self, Either};
+    use futures_util::future::{self, Either};
     use libp2p_stream::IncomingStreams;
     use libp2p_swarm::Swarm;
     use libp2p_swarm_test::SwarmExt;

src/client.rs

@@ -6,8 +6,8 @@ use std::task::{Context, Poll};
 use asynchronous_codec::FramedRead;
 use cid::CidGeneric;
 use fnv::FnvHashMap;
-use futures::future::{BoxFuture, Fuse, FusedFuture};
-use futures::{FutureExt, StreamExt};
+use futures_util::future::{BoxFuture, Fuse, FusedFuture, FutureExt};
+use futures_util::stream::StreamExt;
 use tracing::error;
 
 use crate::cid_prefix::CidPrefix;
@@ -60,7 +60,7 @@ impl<const S: usize> fmt::Debug for IncomingStream<S> {
     }
 }
 
-impl<const S: usize> futures::Stream for IncomingStream<S> {
+impl<const S: usize> futures_core::stream::Stream for IncomingStream<S> {
     type Item = IncomingMessage<S>;
 
     fn poll_next(

src/incoming_stream.rs

@@ -7,7 +7,7 @@ use std::task::{ready, Context, Poll};
 use blockstore::{Blockstore, BlockstoreError};
 use cid::CidGeneric;
 use client::SendingState;
-use futures::{stream::SelectAll, StreamExt};
+use futures_util::stream::{SelectAll, StreamExt};
 use incoming_stream::IncomingMessage;
 use libp2p_core::{multiaddr::Multiaddr, upgrade::ReadyUpgrade, Endpoint};
 use libp2p_identity::PeerId;

src/lib.rs

@@ -13,7 +13,7 @@ use std::fmt::{self, Display};
 use std::future::Future;
 use std::pin::Pin;
 
-use futures::FutureExt;
+use futures_util::future::FutureExt;
 use libp2p_core::multihash::Multihash;
 use multihash_codetable::MultihashDigest;
 

src/multihasher.rs

@@ -8,8 +8,8 @@ use asynchronous_codec::FramedWrite;
 use blockstore::{Blockstore, BlockstoreError};
 use cid::CidGeneric;
 use fnv::{FnvHashMap, FnvHashSet};
-use futures::stream::FuturesUnordered;
-use futures::{SinkExt, StreamExt};
+use futures_util::sink::SinkExt;
+use futures_util::stream::{FuturesUnordered, StreamExt};
 use libp2p_core::upgrade::ReadyUpgrade;
 use libp2p_identity::PeerId;
 use libp2p_swarm::{

src/server.rs

@@ -3,7 +3,7 @@
 use std::future::Future;
 
 use cid::CidGeneric;
-use futures::FutureExt;
+use futures_util::future::FutureExt;
 use libp2p_core::multihash::Multihash;
 use libp2p_swarm::StreamProtocol;
 
@@ -33,7 +33,7 @@ pub(crate) fn stream_protocol(
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-pub(crate) type BoxFuture<'a, T> = futures::future::BoxFuture<'a, T>;
+pub(crate) type BoxFuture<'a, T> = futures_core::future::BoxFuture<'a, T>;
 
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) fn box_future<'a, F, T>(f: F) -> BoxFuture<'a, T>
@@ -44,7 +44,7 @@ where
 }
 
 #[cfg(target_arch = "wasm32")]
-pub(crate) type BoxFuture<'a, T> = futures::future::LocalBoxFuture<'a, T>;
+pub(crate) type BoxFuture<'a, T> = futures_core::future::LocalBoxFuture<'a, T>;
 
 #[cfg(target_arch = "wasm32")]
 pub(crate) fn box_future<'a, F, T>(f: F) -> BoxFuture<'a, T>

src/utils.rs

@@ -1,5 +1,6 @@
 use blockstore::{Blockstore, InMemoryBlockstore};
-use futures::{future::FutureExt, poll};
+use futures_util::future::FutureExt;
+use futures_util::poll;
 use tokio::time::{sleep, Duration};
 
 use crate::utils::{cid, spawn_node};

tests/bitswap.rs

@@ -1,13 +1,13 @@
+use std::future::Future;
+
 use beetswap::{Error, Event, QueryId};
 use blockstore::InMemoryBlockstore;
 use cid::CidGeneric;
 use fnv::FnvHashMap;
-use futures::future::{Future, FutureExt};
-use libp2p::{
-    futures::StreamExt,
-    swarm::{DialError, SwarmEvent},
-    tcp, Multiaddr, PeerId, Swarm, SwarmBuilder,
-};
+use futures_util::future::FutureExt;
+use futures_util::stream::StreamExt;
+use libp2p::swarm::{DialError, SwarmEvent};
+use libp2p::{tcp, Multiaddr, PeerId, Swarm, SwarmBuilder};
 use multihash_codetable::{Code, MultihashDigest};
 use tokio::select;
 use tokio::sync::{mpsc, oneshot};