move SinceEpoch to lightning::util::test_utils

Author: kafaichoi

lightning-invoice/src/payment.rs

@@ -881,7 +881,7 @@ mod tests {
 	#[cfg(feature = "std")]
 	#[test]
 	fn fails_paying_invoice_after_max_retry_timeout() {
-		use lightning::util::time::SinceEpoch;
+		use lightning::util::test_utils::SinceEpoch;
 		let event_handled = core::cell::RefCell::new(false);
 		let event_handler = |_: &_| { *event_handled.borrow_mut() = true; };
 

lightning/src/routing/scoring.rs

@@ -1273,8 +1273,8 @@ use util::time::Time;
 
 #[cfg(test)]
 mod tests {
-	use super::{ChannelLiquidity, ProbabilisticScoringParameters, ProbabilisticScorerUsingTime, ScoringParameters, ScorerUsingTime, Time};
-	use util::time::SinceEpoch;
+	use super::{ChannelLiquidity, ProbabilisticScoringParameters, ProbabilisticScorerUsingTime, ScoringParameters, ScorerUsingTime};
+	use util::test_utils::SinceEpoch;
 
 	use ln::features::{ChannelFeatures, NodeFeatures};
 	use ln::msgs::{ChannelAnnouncement, ChannelUpdate, OptionalField, UnsignedChannelAnnouncement, UnsignedChannelUpdate};
@@ -1289,6 +1289,7 @@ mod tests {
 	use bitcoin::network::constants::Network;
 	use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
 	use core::time::Duration;
+	use util::time::Time;
 	use io;
 
 	/// A scorer for testing with time that can be manually advanced.

lightning/src/util/test_utils.rs

@@ -26,6 +26,7 @@ use util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
 use util::events;
 use util::logger::{Logger, Level, Record};
 use util::ser::{Readable, ReadableArgs, Writer, Writeable};
+use util::time::Time;
 
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::blockdata::transaction::{Transaction, TxOut};
@@ -46,6 +47,8 @@ use core::time::Duration;
 use sync::{Mutex, Arc};
 use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use core::{cmp, mem};
+use core::cell::Cell;
+use core::ops::Sub;
 use bitcoin::bech32::u5;
 use chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial};
 
@@ -725,3 +728,43 @@ impl core::fmt::Debug for OnRegisterOutput {
 
 /// A scorer useful in testing, when the passage of time isn't a concern.
 pub type TestScorer = FixedPenaltyScorer;
+
+/// Time that can be advanced manually in tests.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct SinceEpoch(Duration);
+
+impl SinceEpoch {
+	thread_local! {
+		static ELAPSED: Cell<Duration> = core::cell::Cell::new(Duration::from_secs(0));
+	}
+
+	pub fn advance(duration: Duration) {
+		Self::ELAPSED.with(|elapsed| elapsed.set(elapsed.get() + duration))
+	}
+}
+
+impl Time for SinceEpoch {
+	fn now() -> Self {
+		Self(Self::duration_since_epoch())
+	}
+
+	fn duration_since(&self, earlier: Self) -> Duration {
+		self.0 - earlier.0
+	}
+	
+	fn duration_since_epoch() -> Duration {
+		Self::ELAPSED.with(|elapsed| elapsed.get())
+	}
+	
+	fn elapsed(&self) -> Duration {
+		Self::duration_since_epoch() - self.0
+	}
+}
+
+impl Sub<Duration> for SinceEpoch {
+	type Output = Self;
+
+	fn sub(self, other: Duration) -> Self {
+		Self(self.0 - other)
+	}
+}

lightning/src/util/time.rs

@@ -9,7 +9,6 @@
 
 use core::ops::Sub;
 use core::time::Duration;
-use core::cell::Cell;
 /// A measurement of time.
 pub trait Time: Copy + Sub<Duration, Output = Self> where Self: Sized {
 	/// Returns an instance corresponding to the current moment.
@@ -31,46 +30,6 @@ pub trait Time: Copy + Sub<Duration, Output = Self> where Self: Sized {
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct Eternity;
 
-#[cfg(not(feature = "no-std"))]
-impl Time for std::time::Instant {
-	fn now() -> Self {
-		std::time::Instant::now()
-	}
-	
-	fn duration_since(&self, earlier: Self) -> Duration {
-		self.duration_since(earlier)
-	}
-	
-	fn duration_since_epoch() -> Duration {
-		use std::time::SystemTime;
-		SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap()
-	}
-	fn elapsed(&self) -> Duration {
-		std::time::Instant::elapsed(self)
-	}
-}
-
-#[cfg(not(feature = "no-std"))]
-impl Time for std::time::SystemTime {
-	fn now() -> Self {
-		std::time::SystemTime::now()
-	}
-	
-	fn duration_since(&self, earlier: Self) -> Duration {
-		self.duration_since(earlier).unwrap()
-	}
-	
-	fn duration_since_epoch() -> Duration {
-		use std::time::SystemTime;
-		SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap()
-	}
-	
-	fn elapsed(&self) -> Duration {
-		std::time::SystemTime::elapsed(self).unwrap()
-	}
-}
-
-
 impl Time for Eternity {
 	fn now() -> Self {
 		Self
@@ -97,50 +56,51 @@ impl Sub<Duration> for Eternity {
 	}
 }
 
-/// Time that can be advanced manually in tests.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct SinceEpoch(Duration);
-
-impl SinceEpoch {
-	thread_local! {
-		static ELAPSED: Cell<Duration> = core::cell::Cell::new(Duration::from_secs(0));
+#[cfg(not(feature = "no-std"))]
+impl Time for std::time::Instant {
+	fn now() -> Self {
+		std::time::Instant::now()
 	}
-
-	pub fn advance(duration: Duration) {
-		Self::ELAPSED.with(|elapsed| elapsed.set(elapsed.get() + duration))
+	
+	fn duration_since(&self, earlier: Self) -> Duration {
+		self.duration_since(earlier)
+	}
+	
+	fn duration_since_epoch() -> Duration {
+		use std::time::SystemTime;
+		SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap()
+	}
+	fn elapsed(&self) -> Duration {
+		std::time::Instant::elapsed(self)
 	}
 }
 
-impl Time for SinceEpoch {
+#[cfg(not(feature = "no-std"))]
+impl Time for std::time::SystemTime {
 	fn now() -> Self {
-		Self(Self::duration_since_epoch())
+		std::time::SystemTime::now()
 	}
 
 	fn duration_since(&self, earlier: Self) -> Duration {
-		self.0 - earlier.0
+		self.duration_since(earlier).unwrap()
 	}
 
 	fn duration_since_epoch() -> Duration {
-		Self::ELAPSED.with(|elapsed| elapsed.get())
+		use std::time::SystemTime;
+		SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap()
 	}
 
 	fn elapsed(&self) -> Duration {
-		Self::duration_since_epoch() - self.0
+		std::time::SystemTime::elapsed(self).unwrap()
 	}
 }
 
-	impl Sub<Duration> for SinceEpoch {
-		type Output = Self;
-
-		fn sub(self, other: Duration) -> Self {
-			Self(self.0 - other)
-		}
-	}
 
 
 #[cfg(test)]
 pub mod tests {
-	use util::time::{Eternity, SinceEpoch, Time};
+	use util::time::{Time, Eternity};
+	use util::test_utils::SinceEpoch;
 
 	use core::time::Duration;