adapt-wasm32-without-fmt

EthanYuan · EthanYuan · commit 973d9cdd22b8 · 2025-03-28T23:46:51.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,6 +3,7 @@ resolver = "2"
 
 members = [
     "lightning",
+    "lightning-common",
     "lightning-types",
     "lightning-block-sync",
     "lightning-invoice",
diff --git a/lightning-background-processor/Cargo.toml b/lightning-background-processor/Cargo.toml
@@ -22,6 +22,7 @@ default = ["std"]
 
 [dependencies]
 bitcoin = { version = "0.32.2", default-features = false }
+lightning-common = { path = "../lightning-common" }
 lightning = { version = "0.0.125", path = "../lightning", default-features = false }
 lightning-rapid-gossip-sync = { version = "0.0.125", path = "../lightning-rapid-gossip-sync", default-features = false }
 
diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
@@ -49,11 +49,11 @@ use core::time::Duration;
 #[cfg(feature = "std")]
 use core::sync::atomic::{AtomicBool, Ordering};
 #[cfg(feature = "std")]
+use lightning_common::Instant;
+#[cfg(feature = "std")]
 use std::sync::Arc;
 #[cfg(feature = "std")]
 use std::thread::{self, JoinHandle};
-#[cfg(feature = "std")]
-use std::time::Instant;
 
 #[cfg(not(feature = "std"))]
 use alloc::boxed::Box;
@@ -949,7 +949,7 @@ impl BackgroundProcessor {
 					handle_network_graph_update(network_graph, &event)
 				}
 				if let Some(ref scorer) = scorer {
-					use std::time::SystemTime;
+					use lightning_common::SystemTime;
 					let duration_since_epoch = SystemTime::now()
 						.duration_since(SystemTime::UNIX_EPOCH)
 						.expect("Time should be sometime after 1970");
@@ -996,7 +996,7 @@ impl BackgroundProcessor {
 				|time: &Instant, dur| time.elapsed().as_secs() > dur,
 				false,
 				|| {
-					use std::time::SystemTime;
+					use lightning_common::SystemTime;
 					Some(
 						SystemTime::now()
 							.duration_since(SystemTime::UNIX_EPOCH)
diff --git a/lightning-common/Cargo.toml b/lightning-common/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "lightning-common"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+web-time = "1.1"
+
+[lints]
+workspace = true
diff --git a/lightning-common/src/lib.rs b/lightning-common/src/lib.rs
@@ -0,0 +1,4 @@
+#[cfg(not(target_arch = "wasm32"))]
+pub use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+#[cfg(target_arch = "wasm32")]
+pub use web_time::{Duration, Instant, SystemTime, UNIX_EPOCH};
diff --git a/lightning-invoice/Cargo.toml b/lightning-invoice/Cargo.toml
@@ -19,6 +19,7 @@ std = []
 
 [dependencies]
 bech32 = { version = "0.9.1", default-features = false }
+lightning-common = { path = "../lightning-common" }
 lightning-types = { version = "0.1.0", path = "../lightning-types", default-features = false }
 serde = { version = "1.0.118", optional = true }
 bitcoin = { version = "0.32.2", default-features = false, features = ["secp-recovery"] }
diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
@@ -31,7 +31,7 @@ extern crate core;
 extern crate serde;
 
 #[cfg(feature = "std")]
-use std::time::SystemTime;
+use lightning_common::SystemTime;
 
 use bech32::{FromBase32, u5};
 use bitcoin::{Address, Network, PubkeyHash, ScriptHash, WitnessProgram, WitnessVersion};
diff --git a/lightning-rapid-gossip-sync/Cargo.toml b/lightning-rapid-gossip-sync/Cargo.toml
@@ -18,6 +18,7 @@ default = ["std"]
 std = []
 
 [dependencies]
+lightning-common = { path = "../lightning-common" }
 lightning = { version = "0.0.125", path = "../lightning", default-features = false }
 bitcoin = { version = "0.32.2", default-features = false }
 
diff --git a/lightning-rapid-gossip-sync/src/processing.rs b/lightning-rapid-gossip-sync/src/processing.rs
@@ -18,7 +18,7 @@ use lightning::{log_debug, log_given_level, log_gossip, log_trace, log_warn};
 use crate::{GraphSyncError, RapidGossipSync};
 
 #[cfg(all(feature = "std", not(test)))]
-use std::time::{SystemTime, UNIX_EPOCH};
+use lightning_common::{SystemTime, UNIX_EPOCH};
 
 #[cfg(all(not(feature = "std"), not(test)))]
 use alloc::{borrow::ToOwned, vec::Vec};
diff --git a/lightning-transaction-sync/Cargo.toml b/lightning-transaction-sync/Cargo.toml
@@ -23,6 +23,7 @@ electrum = ["electrum-client"]
 async-interface = []
 
 [dependencies]
+lightning-common = { path = "../lightning-common" }
 lightning = { version = "0.0.125", path = "../lightning", default-features = false, features = ["std"] }
 bitcoin = { version = "0.32.2", default-features = false }
 bdk-macros = "0.6"
diff --git a/lightning-transaction-sync/src/electrum.rs b/lightning-transaction-sync/src/electrum.rs
@@ -13,10 +13,10 @@ use lightning::{log_debug, log_error, log_trace};
 use bitcoin::block::Header;
 use bitcoin::{BlockHash, Script, Transaction, Txid};
 
+use lightning_common::Instant;
 use std::collections::HashSet;
 use std::ops::Deref;
 use std::sync::Mutex;
-use std::time::Instant;
 
 /// Synchronizes LDK with a given Electrum server.
 ///
diff --git a/lightning-transaction-sync/src/esplora.rs b/lightning-transaction-sync/src/esplora.rs
@@ -91,7 +91,7 @@ where
 
 		log_trace!(self.logger, "Starting transaction sync.");
 		#[cfg(feature = "time")]
-		let start_time = std::time::Instant::now();
+		let start_time = lightning_common::Instant::now();
 		let mut num_confirmed = 0;
 		let mut num_unconfirmed = 0;
 
diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml
@@ -38,6 +38,7 @@ grind_signatures = []
 default = ["std", "grind_signatures"]
 
 [dependencies]
+lightning-common = { path = "../lightning-common" }
 lightning-types = { version = "0.1.0", path = "../lightning-types", default-features = false }
 lightning-invoice = { version = "0.32.0", path = "../lightning-invoice", default-features = false }
 
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -6130,8 +6130,8 @@ where
 			}
 
 			#[cfg(feature = "std")]
-			let duration_since_epoch = std::time::SystemTime::now()
-				.duration_since(std::time::SystemTime::UNIX_EPOCH)
+			let duration_since_epoch = lightning_common::SystemTime::now()
+				.duration_since(lightning_common::SystemTime::UNIX_EPOCH)
 				.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
 			#[cfg(not(feature = "std"))]
 			let duration_since_epoch = Duration::from_secs(
@@ -9350,8 +9350,8 @@ where
 			self.highest_seen_timestamp.load(Ordering::Acquire) as u64
 		);
 		#[cfg(feature = "std")]
-		let now = std::time::SystemTime::now()
-			.duration_since(std::time::SystemTime::UNIX_EPOCH)
+		let now = lightning_common::SystemTime::now()
+			.duration_since(lightning_common::SystemTime::UNIX_EPOCH)
 			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
 
 		now
diff --git a/lightning/src/ln/invoice_utils.rs b/lightning/src/ln/invoice_utils.rs
@@ -346,7 +346,7 @@ where
 	R::Target: Router,
 	L::Target: Logger,
 {
-	use std::time::SystemTime;
+	use lightning_common::SystemTime;
 	let duration = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
 		.expect("for the foreseeable future this shouldn't happen");
 	create_invoice_from_channelmanager_and_duration_since_epoch(
@@ -387,7 +387,7 @@ where
 	R::Target: Router,
 	L::Target: Logger,
 {
-	use std::time::SystemTime;
+	use lightning_common::SystemTime;
 
 	let duration = SystemTime::now()
 		.duration_since(SystemTime::UNIX_EPOCH)
diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
@@ -26,9 +26,11 @@ use crate::routing::router::{BlindedTail, InFlightHtlcs, Path, PaymentParameters
 use crate::sign::{EntropySource, NodeSigner, Recipient};
 use crate::util::errors::APIError;
 use crate::util::logger::Logger;
-#[cfg(feature = "std")]
-use crate::util::time::Instant;
 use crate::util::ser::ReadableArgs;
+#[cfg(test)]
+use crate::util::time::Instant;
+#[cfg(not(test))]
+use lightning_common::Instant;
 
 use core::fmt::{self, Display, Formatter};
 use core::ops::Deref;
@@ -328,7 +330,7 @@ impl Retry {
 #[cfg(feature = "std")]
 pub(super) fn has_expired(route_params: &RouteParameters) -> bool {
 	if let Some(expiry_time) = route_params.payment_params.expiry_time {
-		if let Ok(elapsed) = std::time::SystemTime::UNIX_EPOCH.elapsed() {
+		if let Ok(elapsed) = lightning_common::SystemTime::UNIX_EPOCH.elapsed() {
 			return elapsed > core::time::Duration::from_secs(expiry_time)
 		}
 	}
@@ -2001,7 +2003,8 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
 		let keys_manager = test_utils::TestKeysInterface::new(&[0; 32], Network::Testnet);
 
-		let past_expiry_time = std::time::SystemTime::UNIX_EPOCH.elapsed().unwrap().as_secs() - 2;
+		let past_expiry_time =
+			lightning_common::SystemTime::UNIX_EPOCH.elapsed().unwrap().as_secs() - 2;
 		let payment_params = PaymentParameters::from_node_id(
 				PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap()),
 				0
diff --git a/lightning/src/ln/payment_tests.rs b/lightning/src/ln/payment_tests.rs
@@ -47,7 +47,7 @@ use crate::routing::gossip::NodeId;
 #[cfg(feature = "std")]
 use {
 	crate::util::time::Instant as TestTime,
-	std::time::{SystemTime, Instant, Duration},
+	lightning_common::{SystemTime, Instant, Duration},
 };
 
 #[test]
diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
@@ -2912,7 +2912,7 @@ mod tests {
 		// Until we have std::thread::scoped we have to unsafe { turn off the borrow checker }.
 		let peers = Arc::new(create_network(2, unsafe { &*(&*cfgs as *const _) as &'static _ }));
 
-		let start_time = std::time::Instant::now();
+		let start_time = lightning_common::Instant::now();
 		macro_rules! spawn_thread { ($id: expr) => { {
 			let peers = Arc::clone(&peers);
 			let cfgs = Arc::clone(&cfgs);
@@ -3445,7 +3445,7 @@ mod tests {
 	#[test]
 	#[cfg(feature = "std")]
 	fn test_process_events_multithreaded() {
-		use std::time::{Duration, Instant};
+		use lightning_common::{Duration, Instant};
 		// `process_events` shouldn't block on another thread processing events and instead should
 		// simply signal the currently processing thread to go around the loop again.
 		// Here we test that this happens by spawning a few threads and checking that we see one go
diff --git a/lightning/src/offers/invoice.rs b/lightning/src/offers/invoice.rs
@@ -136,7 +136,7 @@ use crate::util::string::PrintableString;
 use crate::prelude::*;
 
 #[cfg(feature = "std")]
-use std::time::SystemTime;
+use lightning_common::SystemTime;
 
 pub(crate) const DEFAULT_RELATIVE_EXPIRY: Duration = Duration::from_secs(7200);
 
diff --git a/lightning/src/offers/invoice_request.rs b/lightning/src/offers/invoice_request.rs
@@ -709,8 +709,8 @@ macro_rules! invoice_request_respond_with_explicit_signing_pubkey_methods { (
 	pub fn respond_with(
 		&$self, payment_paths: Vec<BlindedPaymentPath>, payment_hash: PaymentHash
 	) -> Result<$builder, Bolt12SemanticError> {
-		let created_at = std::time::SystemTime::now()
-			.duration_since(std::time::SystemTime::UNIX_EPOCH)
+		let created_at = lightning_common::SystemTime::now()
+			.duration_since(lightning_common::SystemTime::UNIX_EPOCH)
 			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
 
 		$contents.respond_with_no_std(payment_paths, payment_hash, created_at)
@@ -882,8 +882,8 @@ macro_rules! invoice_request_respond_with_derived_signing_pubkey_methods { (
 	pub fn respond_using_derived_keys(
 		&$self, payment_paths: Vec<BlindedPaymentPath>, payment_hash: PaymentHash
 	) -> Result<$builder, Bolt12SemanticError> {
-		let created_at = std::time::SystemTime::now()
-			.duration_since(std::time::SystemTime::UNIX_EPOCH)
+		let created_at = lightning_common::SystemTime::now()
+			.duration_since(lightning_common::SystemTime::UNIX_EPOCH)
 			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
 
 		$self.respond_using_derived_keys_no_std(payment_paths, payment_hash, created_at)
diff --git a/lightning/src/offers/offer.rs b/lightning/src/offers/offer.rs
@@ -110,7 +110,7 @@ use {
 use crate::prelude::*;
 
 #[cfg(feature = "std")]
-use std::time::SystemTime;
+use lightning_common::SystemTime;
 
 pub(super) const IV_BYTES_WITH_METADATA: &[u8; IV_LEN] = b"LDK Offer ~~~~~~";
 pub(super) const IV_BYTES_WITHOUT_METADATA: &[u8; IV_LEN] = b"LDK Offer v2~~~~";
diff --git a/lightning/src/offers/refund.rs b/lightning/src/offers/refund.rs
@@ -120,7 +120,7 @@ use {
 use crate::prelude::*;
 
 #[cfg(feature = "std")]
-use std::time::SystemTime;
+use lightning_common::SystemTime;
 
 pub(super) const IV_BYTES_WITH_METADATA: &[u8; IV_LEN] = b"LDK Refund ~~~~~";
 pub(super) const IV_BYTES_WITHOUT_METADATA: &[u8; IV_LEN] = b"LDK Refund v2~~~";
@@ -535,8 +535,8 @@ macro_rules! respond_with_explicit_signing_pubkey_methods { ($self: ident, $buil
 		&$self, payment_paths: Vec<BlindedPaymentPath>, payment_hash: PaymentHash,
 		signing_pubkey: PublicKey,
 	) -> Result<$builder, Bolt12SemanticError> {
-		let created_at = std::time::SystemTime::now()
-			.duration_since(std::time::SystemTime::UNIX_EPOCH)
+		let created_at = lightning_common::SystemTime::now()
+			.duration_since(lightning_common::SystemTime::UNIX_EPOCH)
 			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
 
 		$self.respond_with_no_std(payment_paths, payment_hash, signing_pubkey, created_at)
@@ -593,8 +593,8 @@ macro_rules! respond_with_derived_signing_pubkey_methods { ($self: ident, $build
 	where
 		ES::Target: EntropySource,
 	{
-		let created_at = std::time::SystemTime::now()
-			.duration_since(std::time::SystemTime::UNIX_EPOCH)
+		let created_at = lightning_common::SystemTime::now()
+			.duration_since(lightning_common::SystemTime::UNIX_EPOCH)
 			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
 
 		$self.respond_using_derived_keys_no_std(
diff --git a/lightning/src/offers/test_utils.rs b/lightning/src/offers/test_utils.rs
@@ -106,8 +106,8 @@ pub(crate) fn payment_hash() -> PaymentHash {
 }
 
 pub(crate) fn now() -> Duration {
-	std::time::SystemTime::now()
-		.duration_since(std::time::SystemTime::UNIX_EPOCH)
+	lightning_common::SystemTime::now()
+		.duration_since(lightning_common::SystemTime::UNIX_EPOCH)
 		.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH")
 }
 
diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs
@@ -48,7 +48,7 @@ use core::{cmp, fmt};
 pub use lightning_types::routing::RoutingFees;
 
 #[cfg(feature = "std")]
-use std::time::{SystemTime, UNIX_EPOCH};
+use lightning_common::{SystemTime, UNIX_EPOCH};
 
 /// We remove stale channel directional info two weeks after the last update, per BOLT 7's
 /// suggestion.
@@ -2676,7 +2676,7 @@ pub(crate) mod tests {
 
 		#[cfg(feature = "std")]
 		{
-			use std::time::{SystemTime, UNIX_EPOCH};
+			use lightning_common::{SystemTime, UNIX_EPOCH};
 
 			let tracking_time = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs();
 			// Mark a node as permanently failed so it's tracked as removed.
@@ -2996,7 +2996,7 @@ pub(crate) mod tests {
 			// We want to check that this will work even if *one* of the channel updates is recent,
 			// so we should add it with a recent timestamp.
 			assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_none());
-			use std::time::{SystemTime, UNIX_EPOCH};
+			use lightning_common::{SystemTime, UNIX_EPOCH};
 			let announcement_time = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs();
 			let valid_channel_update = get_signed_channel_update(|unsigned_channel_update| {
 				unsigned_channel_update.timestamp = (announcement_time + 1 + STALE_CHANNEL_UPDATE_AGE_LIMIT_SECS) as u32;
@@ -3017,7 +3017,7 @@ pub(crate) mod tests {
 
 		#[cfg(feature = "std")]
 		{
-			use std::time::{SystemTime, UNIX_EPOCH};
+			use lightning_common::{SystemTime, UNIX_EPOCH};
 
 			let tracking_time = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs();
 
@@ -3268,7 +3268,7 @@ pub(crate) mod tests {
 	#[test]
 	#[cfg(feature = "std")]
 	fn calling_sync_routing_table() {
-		use std::time::{SystemTime, UNIX_EPOCH};
+		use lightning_common::{SystemTime, UNIX_EPOCH};
 		use crate::ln::msgs::Init;
 
 		let network_graph = create_network_graph();
diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
@@ -1055,7 +1055,7 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 		let mut gossip_start_time = 0;
 		#[cfg(not(feature = "no-std"))]
 		{
-			use std::time::{SystemTime, UNIX_EPOCH};
+			use lightning_common::{SystemTime, UNIX_EPOCH};
 			gossip_start_time = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs();
 			if self.request_full_sync.load(Ordering::Acquire) {
 				gossip_start_time -= 60 * 60 * 24 * 7 * 2; // 2 weeks ago
diff --git a/lightning/src/util/time.rs b/lightning/src/util/time.rs
@@ -10,7 +10,7 @@
 #[cfg(test)]
 pub use test::Instant;
 #[cfg(not(test))]
-pub use std::time::Instant;
+pub use lightning_common::Instant;
 
 #[cfg(test)]
 mod test {
