diff --git a/Cargo.lock b/Cargo.lock index 1807c5b2..32e20916 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2835,6 +2835,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test", + "web-time", ] [[package]] @@ -5173,6 +5174,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "which" version = "4.4.2" diff --git a/node/Cargo.toml b/node/Cargo.toml index da62eeb1..a57b1759 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -48,6 +48,7 @@ thiserror = "1.0.48" tokio = { version = "1.32.0", features = ["macros", "sync"] } tokio-util = "0.7.9" tracing = "0.1.37" +web-time = "1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] backoff = { version = "0.4.0", features = ["tokio"] } diff --git a/node/src/daser.rs b/node/src/daser.rs index d3717f03..5df1a695 100644 --- a/node/src/daser.rs +++ b/node/src/daser.rs @@ -36,11 +36,11 @@ use celestia_tendermint::Time; use celestia_types::ExtendedHeader; use futures::stream::FuturesUnordered; use futures::StreamExt; -use instant::{Duration, Instant}; use rand::Rng; use tokio::select; use tokio_util::sync::CancellationToken; use tracing::{debug, error, warn}; +use web_time::{Duration, Instant}; use crate::executor::spawn; use crate::p2p::shwap::sample_cid; diff --git a/node/src/p2p.rs b/node/src/p2p.rs index b8c0535a..d7106a95 100644 --- a/node/src/p2p.rs +++ b/node/src/p2p.rs @@ -31,7 +31,6 @@ use celestia_types::{fraud_proof::BadEncodingFraudProof, hash::Hash}; use celestia_types::{ExtendedHeader, FraudProof, Height}; use cid::Cid; use futures::StreamExt; -use instant::Instant; use libp2p::{ autonat, core::{ConnectedPoint, Endpoint}, @@ -49,6 +48,7 @@ use tokio::select; use tokio::sync::{mpsc, oneshot, watch}; use tokio_util::sync::CancellationToken; use tracing::{debug, info, instrument, trace, warn}; +use web_time::Instant; mod header_ex; mod header_session; diff --git a/node/src/p2p/header_ex.rs b/node/src/p2p/header_ex.rs index 4b1dfd9c..79b18d1f 100644 --- a/node/src/p2p/header_ex.rs +++ b/node/src/p2p/header_ex.rs @@ -6,7 +6,6 @@ use async_trait::async_trait; use celestia_proto::p2p::pb::{HeaderRequest, HeaderResponse}; use celestia_types::ExtendedHeader; use futures::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}; -use instant::{Duration, Instant}; use libp2p::{ core::Endpoint, request_response::{self, Codec, InboundFailure, OutboundFailure, ProtocolSupport}, @@ -19,6 +18,7 @@ use libp2p::{ }; use prost::Message; use tracing::{debug, instrument, warn}; +use web_time::{Duration, Instant}; mod client; mod server; diff --git a/node/src/p2p/swarm.rs b/node/src/p2p/swarm.rs index 397a23ec..fab45cf6 100644 --- a/node/src/p2p/swarm.rs +++ b/node/src/p2p/swarm.rs @@ -1,5 +1,5 @@ -use instant::Duration; use libp2p::{identity::Keypair, swarm::NetworkBehaviour, Swarm, SwarmBuilder}; +use web_time::Duration; use crate::p2p::P2pError;