fix: more n0-future

Author: Frando

src/api/downloader.rs

@@ -13,7 +13,7 @@ use irpc::{channel::mpsc, rpc_requests};
 use n0_future::{future, stream, BufferedStreamExt, Stream, StreamExt};
 use rand::seq::SliceRandom;
 use serde::{de::Error, Deserialize, Serialize};
-use tokio::task::JoinSet;
+use n0_future::task::JoinSet;
 use tracing::instrument::Instrument;
 
 use super::Store;
@@ -42,7 +42,7 @@ struct DownloaderActor {
     store: Store,
     pool: ConnectionPool,
     tasks: JoinSet<()>,
-    running: HashSet<tokio::task::Id>,
+    running: HashSet<n0_future::task::Id>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]

src/store/readonly_mem.rs

@@ -26,7 +26,7 @@ use irpc::channel::mpsc;
 use n0_future::future::{self, yield_now};
 use range_collections::range_set::RangeSetRange;
 use ref_cast::RefCast;
-use tokio::task::{JoinError, JoinSet};
+use n0_future::task::{JoinError, JoinSet};
 
 use super::util::BaoTreeSender;
 use crate::{

src/tests.rs

@@ -344,7 +344,7 @@ fn event_handler(
     let (count_tx, count_rx) = tokio::sync::watch::channel(0usize);
     let (events_tx, mut events_rx) = EventSender::channel(16, EventMask::ALL_READONLY);
     let allowed_nodes = allowed_nodes.into_iter().collect::<HashSet<_>>();
-    let task = AbortOnDropHandle::new(tokio::task::spawn(async move {
+    let task = AbortOnDropHandle::new(n0_future::task::spawn(async move {
         while let Some(event) = events_rx.recv().await {
             match event {
                 ProviderMessage::ClientConnected(msg) => {
@@ -358,7 +358,7 @@ fn event_handler(
                 ProviderMessage::PushRequestReceived(mut msg) => {
                     msg.tx.send(Ok(())).await.ok();
                     let count_tx = count_tx.clone();
-                    tokio::task::spawn(async move {
+                    n0_future::task::spawn(async move {
                         while let Ok(Some(update)) = msg.rx.recv().await {
                             if let RequestUpdate::Completed(_) = update {
                                 count_tx.send_modify(|x| *x += 1);