fix(wasm): use n0_future for all time::{Instant, Duration} references

Author: b5

Cargo.lock

@@ -18,7 +18,7 @@ bytes = { version = "1", features = ["serde"] }
 derive_more = { version = "2.0.1", features = ["from", "try_from", "into", "debug", "display", "deref", "deref_mut"] }
 futures-lite = "2.6.0"
 quinn = { package = "iroh-quinn", version = "0.14.0", optional = true }
-n0-future = "0.3.0"
+n0-future = "0.3.1"
 n0-snafu = "0.2.2"
 range-collections = { version = "0.4.6", features = ["serde"] }
 smallvec = { version = "1", features = ["serde", "const_new"] }

Cargo.toml

@@ -16,15 +16,12 @@
 //! or you can choose to finish early.
 //!
 //! [iroh]: https://docs.rs/iroh
-use std::{
-    fmt::{self, Debug},
-    time::Duration,
-};
+use std::fmt::{self, Debug};
 
 use anyhow::Result;
 use bao_tree::{io::fsm::BaoContentItem, ChunkNum};
 use fsm::RequestCounters;
-use n0_future::time::Instant;
+use n0_future::time::{Duration, Instant};
 use n0_snafu::SpanTrace;
 use nested_enum_utils::common_fields;
 use serde::{Deserialize, Serialize};

src/get.rs

@@ -3,13 +3,16 @@
 //! Note that while using this API directly is fine, the standard way
 //! to provide data is to just register a [`crate::BlobsProtocol`] protocol
 //! handler with an [`iroh::Endpoint`](iroh::protocol::Router).
-use std::{fmt::Debug, future::Future, io, time::Duration};
+use std::{fmt::Debug, future::Future, io};
 
 use anyhow::Result;
 use bao_tree::ChunkRanges;
 use iroh::endpoint::{self, ConnectionError, VarInt};
 use iroh_io::{AsyncStreamReader, AsyncStreamWriter};
-use n0_future::{time::Instant, StreamExt};
+use n0_future::{
+    time::{Duration, Instant},
+    StreamExt,
+};
 use serde::{Deserialize, Serialize};
 use snafu::Snafu;
 use tokio::select;

src/provider.rs

@@ -5,12 +5,12 @@ use std::{
     io,
     ops::{Bound, Deref, DerefMut},
     path::PathBuf,
-    time::SystemTime,
 };
 
 use bao_tree::BaoTree;
 use bytes::Bytes;
 use irpc::channel::mpsc;
+use n0_future::time::SystemTime;
 use n0_snafu::SpanTrace;
 use nested_enum_utils::common_fields;
 use redb::{Database, DatabaseError, ReadableTable};

src/store/fs/meta.rs

@@ -1,8 +1,7 @@
 //! Options for configuring the file store.
-use std::{
-    path::{Path, PathBuf},
-    time::Duration,
-};
+use std::path::{Path, PathBuf};
+
+use n0_future::time::Duration;
 
 use super::{meta::raw_outboard_size, temp_name};
 use crate::{store::gc::GcConfig, Hash};

src/store/fs/options.rs

@@ -819,10 +819,10 @@ mod tests {
                 atomic::{AtomicUsize, Ordering},
                 Arc, Mutex,
             },
-            time::Instant,
         };
 
         use atomic_refcell::AtomicRefCell;
+        use n0_future::time::Instant;
 
         use super::*;
 
@@ -1070,10 +1070,10 @@ mod tests {
             collections::HashSet,
             path::{Path, PathBuf},
             sync::{Arc, Mutex},
-            time::Instant,
         };
 
         use atomic_refcell::AtomicRefCell;
+        use n0_future::time::Instant;
 
         use super::*;
 

src/store/fs/util/entity_manager.rs

@@ -134,7 +134,7 @@ fn gc_sweep<'a>(
 #[derive(derive_more::Debug, Clone)]
 pub struct GcConfig {
     /// Interval in which to run garbage collection.
-    pub interval: std::time::Duration,
+    pub interval: n0_future::time::Duration,
     /// Optional callback to manually add protected blobs.
     ///
     /// The callback is called before each garbage collection run. It gets a `&mut HashSet<Hash>`

src/store/gc.rs

@@ -16,7 +16,6 @@ use std::{
         atomic::{AtomicUsize, Ordering},
         Arc,
     },
-    time::Duration,
 };
 
 use iroh::{
@@ -25,6 +24,7 @@ use iroh::{
 };
 use n0_future::{
     future::{self},
+    time::Duration,
     FuturesUnordered, MaybeFuture, Stream, StreamExt,
 };
 use snafu::Snafu;