fixup: Extend LSPSDateTime to avoid using std::SystemTime

Author: martinsaposnic

lightning-liquidity/src/lsps0/ser.rs

@@ -27,9 +27,6 @@ use bitcoin::secp256k1::PublicKey;
 use core::fmt::{self, Display};
 use core::str::FromStr;
 
-#[cfg(feature = "std")]
-use std::time::{SystemTime, UNIX_EPOCH};
-
 use serde::de::{self, MapAccess, Visitor};
 use serde::ser::SerializeStruct;
 use serde::{Deserialize, Deserializer, Serialize};
@@ -201,15 +198,35 @@ impl LSPSDateTime {
 	}
 
 	/// Returns if the given time is in the past.
-	#[cfg(feature = "std")]
 	pub fn is_past(&self) -> bool {
-		let now_seconds_since_epoch = SystemTime::now()
-			.duration_since(UNIX_EPOCH)
-			.expect("system clock to be ahead of the unix epoch")
-			.as_secs();
 		let datetime_seconds_since_epoch =
-			self.0.timestamp().try_into().expect("expiration to be ahead of unix epoch");
-		now_seconds_since_epoch > datetime_seconds_since_epoch
+			self.timestamp().try_into().expect("expiration to be ahead of unix epoch");
+		LSPSDateTime::now().timestamp() > datetime_seconds_since_epoch
+	}
+
+	/// Returns the timestamp as seconds since the Unix epoch.
+	pub fn timestamp(&self) -> i64 {
+		self.0.timestamp()
+	}
+
+	/// Returns the current time as an LSPSDateTime.
+	pub fn now() -> Self {
+		Self(chrono::Utc::now())
+	}
+
+	/// Returns the duration between the current time and the given time.
+	pub fn duration_since(&self, other: &Self) -> chrono::Duration {
+		self.0.signed_duration_since(other.0)
+	}
+
+	/// Returns the substracted duration from the given time.
+	pub fn checked_sub_signed(&self, duration: chrono::Duration) -> Option<Self> {
+		self.0.checked_sub_signed(duration).map(Self)
+	}
+
+	/// Returns the added duration to the given time.
+	pub fn checked_add_signed(&self, duration: chrono::Duration) -> Option<Self> {
+		self.0.checked_add_signed(duration).map(Self)
 	}
 }