Use n0_future and remove task module in favor for it

iroh-net-report/Cargo.toml

@@ -24,6 +24,7 @@ futures-lite = "2.3"
 iroh-base = { version = "0.31.0", path = "../iroh-base", default-features = false, features = ["relay"] }
 iroh-metrics = { version = "0.31", default-features = false }
 iroh-relay = { version = "0.31", path = "../iroh-relay", default-features = false }
+n0-future = "0.0.1"
 quinn = { package = "iroh-quinn", version = "0.12.0", default-features = false }
 rand = "0.8"
 reqwest = { version = "0.12", default-features = false, features = ["stream"] }

iroh-net-report/src/defaults.rs

@@ -2,7 +2,7 @@
 
 /// Contains all timeouts that we use in `iroh-net-report`.
 pub(crate) mod timeouts {
-    use iroh_relay::time::Duration;
+    use n0_future::time::Duration;
 
     // Timeouts for net_report
 

iroh-net-report/src/dns.rs

@@ -3,7 +3,7 @@ use std::{fmt::Write, net::IpAddr};
 use anyhow::Result;
 use futures_lite::{Future, StreamExt};
 use hickory_resolver::{IntoName, TokioResolver};
-use iroh_relay::time;
+use n0_future::time;
 
 use crate::defaults::timeouts::DNS_TIMEOUT;
 

iroh-net-report/src/lib.rs

@@ -16,18 +16,17 @@ use std::{
     sync::Arc,
 };
 
-use crate::task::AbortOnDropHandle;
 use anyhow::{anyhow, Result};
 use bytes::Bytes;
 #[cfg(not(wasm_browser))]
 use hickory_resolver::TokioResolver as DnsResolver;
 use iroh_base::RelayUrl;
 #[cfg(feature = "metrics")]
 use iroh_metrics::inc;
-use iroh_relay::{
-    protos::stun,
+use iroh_relay::{protos::stun, RelayMap};
+use n0_future::{
+    task::{self, AbortOnDropHandle},
     time::{self, Duration, Instant},
-    RelayMap,
 };
 #[cfg(not(wasm_browser))]
 use netwatch::UdpSocket;
@@ -42,8 +41,6 @@ mod metrics;
 mod ping;
 mod reportgen;
 
-pub mod task;
-
 pub use metrics::Metrics;
 use reportgen::ProbeProto;
 pub use reportgen::QuicConfig;

iroh-net-report/src/ping.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use anyhow::{Context, Result};
-use iroh_relay::time::Duration;
+use n0_future::time::Duration;
 use surge_ping::{Client, Config, IcmpPacket, PingIdentifier, PingSequence, ICMP};
 use tracing::debug;
 

iroh-net-report/src/reportgen.rs

@@ -25,7 +25,6 @@ use std::{
     task::{Context, Poll},
 };
 
-use crate::task::{self, AbortOnDropHandle, JoinSet};
 use anyhow::{anyhow, bail, Context as _, Result};
 use futures_lite::StreamExt as _;
 #[cfg(not(wasm_browser))]
@@ -37,9 +36,12 @@ use iroh_relay::{
     defaults::{DEFAULT_RELAY_QUIC_PORT, DEFAULT_STUN_PORT},
     http::RELAY_PROBE_PATH,
     protos::stun,
-    time::{self, Duration, Instant},
     RelayMap, RelayNode,
 };
+use n0_future::{
+    task::{self, AbortOnDropHandle, JoinSet},
+    time::{self, Duration, Instant},
+};
 #[cfg(not(wasm_browser))]
 use netwatch::{interfaces, UdpSocket};
 use rand::seq::IteratorRandom;

iroh-net-report/src/reportgen/hairpin.rs

@@ -16,6 +16,7 @@ use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 
 use anyhow::{bail, Context, Result};
 use iroh_relay::protos::stun;
+use n0_future::task;
 use netwatch::UdpSocket;
 use tokio::sync::oneshot;
 use tokio_util::task::AbortOnDropHandle;
@@ -24,7 +25,7 @@ use tracing::{debug, error, info_span, trace, warn, Instrument};
 use crate::{
     self as net_report,
     defaults::timeouts::HAIRPIN_CHECK_TIMEOUT,
-    reportgen, task,
+    reportgen,
     time::{self, Instant},
     Inflight,
 };
@@ -180,7 +181,7 @@ impl Actor {
 #[cfg(test)]
 mod tests {
     use bytes::BytesMut;
-    use iroh_relay::time::Duration;
+    use n0_future::time::Duration;
     use tokio::sync::mpsc;
     use tracing::info;
 

iroh-net-report/src/reportgen/probes.rs

@@ -9,11 +9,11 @@ use std::{collections::BTreeSet, fmt, sync::Arc};
 use anyhow::{ensure, Result};
 use iroh_base::RelayUrl;
 use iroh_relay::{RelayMap, RelayNode};
+use n0_future::time::Duration;
 #[cfg(not(wasm_browser))]
 use netwatch::interfaces;
 
 use crate::Report;
-use iroh_relay::time::Duration;
 
 /// The retransmit interval used when net_report first runs.
 ///