f - fix no-std

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -9006,6 +9006,17 @@ where
 	) -> Result<BlindedPath, ()> {
 		const MAX_SHORT_LIVED_RELATIVE_EXPIRY: Duration = Duration::from_secs(60 * 60 * 24);
 
+		let now = self.duration_since_epoch();
+		let max_short_lived_absolute_expiry = now.saturating_add(MAX_SHORT_LIVED_RELATIVE_EXPIRY);
+
+		if absolute_expiry.unwrap_or(Duration::MAX) <= max_short_lived_absolute_expiry {
+			self.create_compact_blinded_path()
+		} else {
+			self.create_blinded_path()
+		}
+	}
+
+	pub(super) fn duration_since_epoch(&self) -> Duration {
 		#[cfg(not(feature = "std"))]
 		let now = Duration::from_secs(
 			self.highest_seen_timestamp.load(Ordering::Acquire) as u64
@@ -9015,12 +9026,7 @@ where
 			.duration_since(std::time::SystemTime::UNIX_EPOCH)
 			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
 
-		let max_short_lived_absolute_expiry = now.saturating_add(MAX_SHORT_LIVED_RELATIVE_EXPIRY);
-		if absolute_expiry.unwrap_or(Duration::MAX) <= max_short_lived_absolute_expiry {
-			self.create_compact_blinded_path()
-		} else {
-			self.create_blinded_path()
-		}
+		now
 	}
 
 	/// Creates a blinded path by delegating to [`MessageRouter::create_blinded_paths`].

lightning/src/ln/functional_test_utils.rs

@@ -50,7 +50,6 @@ use core::cell::RefCell;
 use core::iter::repeat;
 use core::mem;
 use core::ops::Deref;
-use core::time::Duration;
 use crate::io;
 use crate::prelude::*;
 use crate::sync::{Arc, Mutex, LockTestExt, RwLock};
@@ -465,19 +464,6 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 		self.override_init_features.borrow().clone()
 			.unwrap_or_else(|| self.node.init_features() | self.onion_messenger.provided_init_features(peer_node_id))
 	}
-
-	pub fn duration_since_epoch(&self) -> Duration {
-		#[cfg(not(feature = "std"))]
-		let now = Duration::from_secs(
-			self.node.highest_seen_timestamp.load(Ordering::Acquire) as u64
-		);
-		#[cfg(feature = "std")]
-		let now = std::time::SystemTime::now()
-			.duration_since(std::time::SystemTime::UNIX_EPOCH)
-			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
-
-		now
-	}
 }
 
 #[cfg(feature = "std")]

lightning/src/ln/offers_tests.rs

@@ -366,11 +366,11 @@ fn creates_short_lived_offer() {
 	let alice_id = alice.node.get_our_node_id();
 	let bob = &nodes[1];
 
-	let absolute_expiry = Some(alice.duration_since_epoch() + Duration::from_secs(60 * 60 * 24));
+	let absolute_expiry = alice.node.duration_since_epoch() + Duration::from_secs(60 * 60 * 24);
 	let offer = alice.node
-		.create_offer_builder(absolute_expiry).unwrap()
+		.create_offer_builder(Some(absolute_expiry)).unwrap()
 		.build().unwrap();
-	assert_eq!(offer.absolute_expiry(), absolute_expiry);
+	assert_eq!(offer.absolute_expiry(), Some(absolute_expiry));
 	assert!(!offer.paths().is_empty());
 	for path in offer.paths() {
 		let introduction_node_id = resolve_introduction_node(bob, &path);
@@ -392,11 +392,11 @@ fn creates_long_lived_offer() {
 	let alice = &nodes[0];
 	let alice_id = alice.node.get_our_node_id();
 
-	let absolute_expiry = Some(alice.duration_since_epoch() + Duration::from_secs(60 * 60 * 25));
+	let absolute_expiry = alice.node.duration_since_epoch() + Duration::from_secs(60 * 60 * 25);
 	let offer = alice.node
-		.create_offer_builder(absolute_expiry).unwrap()
+		.create_offer_builder(Some(absolute_expiry)).unwrap()
 		.build().unwrap();
-	assert_eq!(offer.absolute_expiry(), absolute_expiry);
+	assert_eq!(offer.absolute_expiry(), Some(absolute_expiry));
 	assert!(!offer.paths().is_empty());
 	for path in offer.paths() {
 		assert_eq!(path.introduction_node, IntroductionNode::NodeId(alice_id));
@@ -426,7 +426,7 @@ fn creates_short_lived_refund() {
 	let bob = &nodes[1];
 	let bob_id = bob.node.get_our_node_id();
 
-	let absolute_expiry = bob.duration_since_epoch() + Duration::from_secs(60 * 60 * 24);
+	let absolute_expiry = bob.node.duration_since_epoch() + Duration::from_secs(60 * 60 * 24);
 	let payment_id = PaymentId([1; 32]);
 	let refund = bob.node
 		.create_refund_builder(10_000_000, absolute_expiry, payment_id, Retry::Attempts(0), None)
@@ -454,7 +454,7 @@ fn creates_long_lived_refund() {
 	let bob = &nodes[1];
 	let bob_id = bob.node.get_our_node_id();
 
-	let absolute_expiry = bob.duration_since_epoch() + Duration::from_secs(60 * 60 * 25);
+	let absolute_expiry = bob.node.duration_since_epoch() + Duration::from_secs(60 * 60 * 25);
 	let payment_id = PaymentId([1; 32]);
 	let refund = bob.node
 		.create_refund_builder(10_000_000, absolute_expiry, payment_id, Retry::Attempts(0), None)