move time logic in scoring to its util::time module

Author: kafaichoi

lightning/src/routing/scoring.rs

@@ -1062,83 +1062,12 @@ impl<T: Time> Readable for ChannelLiquidity<T> {
 	}
 }
 
-pub(crate) mod time {
-	use core::ops::Sub;
-	use core::time::Duration;
-	/// A measurement of time.
-	pub trait Time: Copy + Sub<Duration, Output = Self> where Self: Sized {
-		/// Returns an instance corresponding to the current moment.
-		fn now() -> Self;
-
-		/// Returns the amount of time elapsed since `self` was created.
-		fn elapsed(&self) -> Duration;
-
-		/// Returns the amount of time passed between `earlier` and `self`.
-		fn duration_since(&self, earlier: Self) -> Duration;
-
-		/// Returns the amount of time passed since the beginning of [`Time`].
-		///
-		/// Used during (de-)serialization.
-		fn duration_since_epoch() -> Duration;
-	}
-
-	/// A state in which time has no meaning.
-	#[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)
-		}
-	}
-
-	impl Time for Eternity {
-		fn now() -> Self {
-			Self
-		}
-
-		fn duration_since(&self, _earlier: Self) -> Duration {
-			Duration::from_secs(0)
-		}
-
-		fn duration_since_epoch() -> Duration {
-			Duration::from_secs(0)
-		}
-
-		fn elapsed(&self) -> Duration {
-			Duration::from_secs(0)
-		}
-	}
-
-	impl Sub<Duration> for Eternity {
-		type Output = Self;
-
-		fn sub(self, _other: Duration) -> Self {
-			self
-		}
-	}
-}
-
-pub(crate) use self::time::Time;
+use util::time::Time;
 
 #[cfg(test)]
 mod tests {
 	use super::{ChannelLiquidity, ProbabilisticScoringParameters, ProbabilisticScorerUsingTime, ScoringParameters, ScorerUsingTime, Time};
-	use super::time::Eternity;
+	use util::time::Eternity;
 
 	use ln::features::{ChannelFeatures, NodeFeatures};
 	use ln::msgs::{ChannelAnnouncement, ChannelUpdate, OptionalField, UnsignedChannelAnnouncement, UnsignedChannelUpdate};

lightning/src/util/mod.rs

@@ -20,6 +20,7 @@ pub mod errors;
 pub mod ser;
 pub mod message_signing;
 pub mod invoice;
+pub mod time;
 
 pub(crate) mod atomic_counter;
 pub(crate) mod byte_utils;

lightning/src/util/time.rs

@@ -0,0 +1,78 @@
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+//! A very simple serialization framework which is used to serialize/deserialize messages as well
+//! as ChannelsManagers and ChannelMonitors.
+
+use core::ops::Sub;
+use core::time::Duration;
+/// A measurement of time.
+pub trait Time: Copy + Sub<Duration, Output = Self> where Self: Sized {
+    /// Returns an instance corresponding to the current moment.
+    fn now() -> Self;
+
+    /// Returns the amount of time elapsed since `self` was created.
+    fn elapsed(&self) -> Duration;
+
+    /// Returns the amount of time passed between `earlier` and `self`.
+    fn duration_since(&self, earlier: Self) -> Duration;
+
+    /// Returns the amount of time passed since the beginning of [`Time`].
+    ///
+    /// Used during (de-)serialization.
+    fn duration_since_epoch() -> Duration;
+}
+
+/// A state in which time has no meaning.
+#[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)
+    }
+}
+
+impl Time for Eternity {
+    fn now() -> Self {
+        Self
+    }
+
+    fn duration_since(&self, _earlier: Self) -> Duration {
+        Duration::from_secs(0)
+    }
+
+    fn duration_since_epoch() -> Duration {
+        Duration::from_secs(0)
+    }
+
+    fn elapsed(&self) -> Duration {
+        Duration::from_secs(0)
+    }
+}
+
+impl Sub<Duration> for Eternity {
+    type Output = Self;
+
+    fn sub(self, _other: Duration) -> Self {
+        self
+    }
+}
+