more time fixes

Author: Frando

src/actor.rs

@@ -15,10 +15,9 @@ use irpc::channel::mpsc;
 use n0_future::task::JoinSet;
 use serde::{Deserialize, Serialize};
 use tokio::sync::oneshot;
-use tracing::{debug, error, error_span, trace, warn};
-
 #[cfg(wasm_browser)]
 use tracing::Instrument;
+use tracing::{debug, error, error_span, trace, warn};
 
 use crate::{
     api::{

src/engine.rs

@@ -372,8 +372,9 @@ impl DefaultAuthorStorage {
             }
             #[cfg(feature = "fs-store")]
             Self::Persistent(ref path) => {
-                use anyhow::Context;
                 use std::str::FromStr;
+
+                use anyhow::Context;
                 if path.exists() {
                     let data = tokio::fs::read_to_string(path).await.with_context(|| {
                         format!(

src/engine/live.rs

@@ -4,7 +4,6 @@ use std::{
     collections::{HashMap, HashSet},
     sync::Arc,
 };
-use n0_future::time::SystemTime;
 
 use anyhow::{Context, Result};
 use futures_lite::FutureExt;
@@ -20,6 +19,7 @@ use iroh_blobs::{
     Hash, HashAndFormat,
 };
 use iroh_gossip::net::Gossip;
+use n0_future::time::SystemTime;
 use serde::{Deserialize, Serialize};
 use tokio::{
     sync::{self, mpsc, oneshot},

src/engine/state.rs

@@ -1,11 +1,8 @@
-use std::{
-    collections::BTreeMap,
-    time::Instant,
-};
-use n0_future::time::SystemTime;
+use std::collections::BTreeMap;
 
 use anyhow::Result;
 use iroh::EndpointId;
+use n0_future::time::{Instant, SystemTime};
 use serde::{Deserialize, Serialize};
 use tracing::{debug, warn};
 

src/net.rs

@@ -1,11 +1,9 @@
 //! Network implementation of the iroh-docs protocol
 
-use std::{
-    future::Future,
-    time::{Duration, Instant},
-};
+use std::{future::Future, time::Duration};
 
 use iroh::{Endpoint, EndpointAddr, PublicKey};
+use n0_future::time::Instant;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error_span, trace, Instrument};
 

src/store/fs/tables.rs

@@ -1,9 +1,8 @@
 #![allow(missing_docs)]
 // Table Definitions
 
-use std::time::Instant;
-
 use bytes::Bytes;
+use n0_future::time::Instant;
 use redb::{
     MultimapTable, MultimapTableDefinition, ReadOnlyMultimapTable, ReadOnlyTable, ReadTransaction,
     Table, TableDefinition, WriteTransaction,

src/sync.rs

@@ -6,7 +6,6 @@
 //
 // This is going to change!
 
-use n0_future::{time::SystemTime, IterExt};
 use std::{
     cmp::Ordering,
     fmt::Debug,
@@ -18,6 +17,7 @@ use std::{
 use bytes::{Bytes, BytesMut};
 use ed25519_dalek::{Signature, SignatureError};
 use iroh_blobs::Hash;
+use n0_future::{time::SystemTime, IterExt};
 use serde::{Deserialize, Serialize};
 
 pub use crate::heads::AuthorHeads;

tests/client.rs

@@ -216,7 +216,7 @@ async fn test_default_author_persist() -> TestResult<()> {
         // somehow the blob store is not shutdown correctly (yet?) on macos.
         // so we give it some time until we find a proper fix.
         #[cfg(target_os = "macos")]
-    n0_future::time::sleep(std::time::Duration::from_secs(1)).await;
+        n0_future::time::sleep(std::time::Duration::from_secs(1)).await;
 
         tokio::fs::remove_file(iroh_root.join("default-author")).await?;
         drop(iroh);

tests/sync.rs

@@ -1,9 +1,4 @@
-use std::{
-    collections::HashMap,
-    future::Future,
-    sync::Arc,
-    time::{Duration, Instant},
-};
+use std::{collections::HashMap, future::Future, sync::Arc, time::Duration};
 
 use anyhow::{anyhow, bail, Context, Result};
 use bytes::Bytes;
@@ -20,6 +15,7 @@ use iroh_docs::{
     store::{DownloadPolicy, FilterKind, Query},
     AuthorId, ContentStatus, Entry,
 };
+use n0_future::time::Instant;
 use rand::{CryptoRng, Rng, SeedableRng};
 use tempfile::tempdir;
 use tracing::{debug, error_span, info, Instrument};