fixup wasm imports

n0-computer · Feb 3, 2025 · 96176a3 · 96176a3
1 parent 64bd73f
commit 96176a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/iroh-relay/src/client.rs b/iroh-relay/src/client.rs
@@ -10,13 +10,14 @@ use std::{
 };
 
 use conn::Conn;
+#[cfg(not(wasm_browser))]
 use connect_relay::DnsError;
 #[cfg(not(wasm_browser))]
 use hickory_resolver::TokioResolver as DnsResolver;
 use iroh_base::{RelayUrl, SecretKey};
 use n0_future::{
     split::{split, SplitSink, SplitStream},
-    Sink, Stream,
+    time, Sink, Stream,
 };
 #[cfg(any(test, feature = "test-utils"))]
 use tracing::warn;
@@ -52,6 +53,7 @@ pub enum Error {
     InvalidWebsocketUrl(Url),
     #[error(transparent)]
     Websocket(#[from] tokio_tungstenite_wasm::Error),
+    #[cfg(not(wasm_browser))]
     #[error(transparent)]
     Dns(#[from] DnsError),
     #[error(transparent)]
@@ -67,7 +69,7 @@ pub enum Error {
     #[error(transparent)]
     Io(#[from] std::io::Error),
     #[error("Timeout")]
-    Timeout(#[from] tokio::time::error::Elapsed),
+    Timeout(#[from] time::Elapsed),
     #[error(transparent)]
     Http(#[from] hyper::http::Error),
     #[error("Unexpected frame received {0}")]

diff --git a/iroh-relay/src/protos/relay.rs b/iroh-relay/src/protos/relay.rs
@@ -16,7 +16,7 @@ use bytes::{BufMut, Bytes};
 use iroh_base::{PublicKey, SecretKey, Signature, SignatureError};
 #[cfg(feature = "server")]
 use n0_future::time::Duration;
-use n0_future::{Sink, SinkExt};
+use n0_future::{time, Sink, SinkExt};
 #[cfg(any(test, feature = "server"))]
 use n0_future::{Stream, StreamExt};
 use postcard::experimental::max_size::MaxSize;
@@ -137,7 +137,7 @@ pub enum Error {
     #[error(transparent)]
     SerDe(#[from] postcard::Error),
     #[error("timeout")]
-    Timeout(#[from] tokio::time::error::Elapsed),
+    Timeout(#[from] time::Elapsed),
     #[error(transparent)]
     InvalidSignature(#[from] SignatureError),
     #[error(transparent)]