chore(deps): replace instant with web-time (#1830)

* chore(deps): replace `instant` with `web-time` Close #1597 * fix build * fix build v2 * cargo fmt
paritytech · Oct 22, 2024 · 418bd88 · 418bd88
1 parent c07c760
commit 418bd88
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -133,7 +133,7 @@ send_wrapper = "0.6.0"
 js-sys = "0.3.70"
 wasm-bindgen-futures = "0.4.43"
 futures-timer = "3"
-instant = { version = "0.1.13", default-features = false }
+web-time = { version = "1.1", default-features = false }
 tokio-util = "0.7.12"
 
 # Substrate crates:

diff --git a/lightclient/Cargo.toml b/lightclient/Cargo.toml
@@ -36,7 +36,7 @@ web = [
     # For the light-client platform.
     "wasm-bindgen-futures",
 	"futures-timer/wasm-bindgen",
-    "instant/wasm-bindgen",
+    "web-time",
     "pin-project",
 
     # For websocket.
@@ -66,7 +66,7 @@ wasm-bindgen-futures = { workspace = true, optional = true }
 smoldot = { workspace = true, optional = true }
 pin-project = { workspace = true, optional = true }
 futures-timer = { workspace = true, optional = true }
-instant = { workspace = true, optional = true }
+web-time = { workspace = true, optional = true }
 getrandom = { workspace = true, optional = true }
 
 [package.metadata.docs.rs]

diff --git a/lightclient/src/platform/wasm_helpers.rs b/lightclient/src/platform/wasm_helpers.rs
@@ -11,17 +11,17 @@ use core::time::Duration;
 use futures_util::{future, FutureExt};
 
 pub fn now_from_unix_epoch() -> Duration {
-    instant::SystemTime::now()
-        .duration_since(instant::SystemTime::UNIX_EPOCH)
+    web_time::SystemTime::now()
+        .duration_since(web_time::SystemTime::UNIX_EPOCH)
         .unwrap_or_else(|_| {
             panic!("Invalid systime cannot be configured earlier than `UNIX_EPOCH`")
         })
 }
 
-pub type Instant = instant::Instant;
+pub type Instant = web_time::Instant;
 
 pub fn now() -> Instant {
-    instant::Instant::now()
+    web_time::Instant::now()
 }
 
 pub type Delay = future::BoxFuture<'static, ()>;

diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml
@@ -42,7 +42,6 @@ web = [
     "getrandom/js",
     "subxt-lightclient?/web",
     "subxt-macro/web",
-    "instant/wasm-bindgen",
     "tokio?/sync",
     "finito?/wasm-bindgen",
 ]
@@ -99,7 +98,7 @@ thiserror = { workspace = true }
 tracing = { workspace = true }
 frame-metadata = { workspace = true }
 either = { workspace = true }
-instant = { workspace = true }
+web-time = { workspace = true }
 
 # Provides some deserialization, types like U256/H256 and hashing impls like twox/blake256:
 impl-serde = { workspace = true }

diff --git a/subxt/src/backend/chain_head/mod.rs b/subxt/src/backend/chain_head/mod.rs
@@ -560,7 +560,7 @@ impl<T: Config + Send + Sync + 'static> Backend<T> for ChainHeadBackend<T> {
         let mut finalized_hash: Option<T::Hash> = None;
 
         // Record the start time so that we can time out if things appear to take too long.
-        let start_instant = instant::Instant::now();
+        let start_instant = web_time::Instant::now();
 
         // A quick helper to return a generic error.
         let err_other = |s: &str| Some(Err(Error::Other(s.into())));