f - remove duration_since_epoch

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -9104,7 +9104,7 @@ where
 		&self, params: Bolt11InvoiceParameters,
 	) -> Result<Bolt11Invoice, SignOrCreationError<()>> {
 		let Bolt11InvoiceParameters {
-			currency, amount_msats, description, duration_since_epoch, invoice_expiry_delta_secs,
+			currency, amount_msats, description, invoice_expiry_delta_secs,
 			min_final_cltv_expiry_delta, payment_hash,
 		} = params;
 
@@ -9114,16 +9114,14 @@ where
 		};
 
 		#[cfg(feature = "std")]
-		let duration_since_epoch = duration_since_epoch
-			.unwrap_or_else(|| {
-				use std::time::SystemTime;
-				SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
-					.expect("for the foreseeable future this shouldn't happen")
-			});
+		let duration_since_epoch = {
+			use std::time::SystemTime;
+			SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
+				.expect("for the foreseeable future this shouldn't happen")
+		};
 		#[cfg(not(feature = "std"))]
-		let duration_since_epoch = duration_since_epoch.unwrap_or_else(||
-			Duration::from_secs(self.highest_seen_timestamp.load(Ordering::Acquire) as u64)
-		);
+		let duration_since_epoch =
+			Duration::from_secs(self.highest_seen_timestamp.load(Ordering::Acquire) as u64);
 
 		if let Some(min_final_cltv_expiry_delta) = min_final_cltv_expiry_delta {
 			if min_final_cltv_expiry_delta.saturating_add(3) < MIN_FINAL_CLTV_EXPIRY_DELTA {
@@ -9209,14 +9207,11 @@ pub struct Bolt11InvoiceParameters {
 	/// The description for what the invoice is for, or hash of such description.
 	pub description: Bolt11InvoiceDescription,
 
-	/// The duration since the Unix epoch signifying when the invoice was created. If not set,
-	/// the current time is used or the highest timestamp seen for non-`std` builds.
-	pub duration_since_epoch: Option<Duration>,
-
-	/// The invoice expiration relative to [`duration_since_epoch`]. If not set, the invoice will
-	/// expire in [`DEFAULT_EXPIRY_TIME`] by default.
+	/// The invoice expiration relative to its creation time. If not set, the invoice will expire in
+	/// [`DEFAULT_EXPIRY_TIME`] by default.
 	///
-	/// [`duration_since_epoch`]: Self::duration_since_epoch
+	/// The creation time used is the duration since the Unix epoch for `std` builds. For non-`std`
+	/// builds, the highest block timestamp seen is used instead.
 	pub invoice_expiry_delta_secs: Option<u32>,
 
 	/// The minimum `cltv_expiry` for the last HTLC in the route. If not set, will use
@@ -9241,7 +9236,6 @@ impl Default for Bolt11InvoiceParameters {
 			currency: None,
 			amount_msats: None,
 			description: Bolt11InvoiceDescription::Direct(Description::empty()),
-			duration_since_epoch: None,
 			invoice_expiry_delta_secs: None,
 			min_final_cltv_expiry_delta: None,
 			payment_hash: None,

lightning/src/ln/invoice_utils.rs

@@ -313,7 +313,6 @@ fn rotate_through_iterators<T, I: Iterator<Item = T>>(mut vecs: Vec<I>) -> impl
 	})
 }
 
-#[cfg(feature = "std")]
 /// Utility to construct an invoice. Generally, unless you want to do something like a custom
 /// cltv_expiry, this is what you should be using to create an invoice. The reason being, this
 /// method stores the invoice's payment secret and preimage in `ChannelManager`, so (a) the user
@@ -345,25 +344,18 @@ where
 	MR::Target: MessageRouter,
 	L::Target: Logger,
 {
-	use std::time::SystemTime;
-	let duration_since_epoch = SystemTime::now()
-		.duration_since(SystemTime::UNIX_EPOCH)
-		.expect("for the foreseeable future this shouldn't happen");
-
 	let description = Description::new(description).map_err(SignOrCreationError::CreationError)?;
 	let params = Bolt11InvoiceParameters {
 		currency: Some(network),
 		amount_msats: amt_msat,
 		description: Bolt11InvoiceDescription::Direct(description),
-		duration_since_epoch: Some(duration_since_epoch),
 		invoice_expiry_delta_secs: Some(invoice_expiry_delta_secs),
 		min_final_cltv_expiry_delta,
 		payment_hash: None,
 	};
 	channelmanager.create_bolt11_invoice(params)
 }
 
-#[cfg(feature = "std")]
 /// Utility to construct an invoice. Generally, unless you want to do something like a custom
 /// cltv_expiry, this is what you should be using to create an invoice. The reason being, this
 /// method stores the invoice's payment secret and preimage in `ChannelManager`, so (a) the user
@@ -396,16 +388,10 @@ where
 	MR::Target: MessageRouter,
 	L::Target: Logger,
 {
-	use std::time::SystemTime;
-	let duration_since_epoch = SystemTime::now()
-		.duration_since(SystemTime::UNIX_EPOCH)
-		.expect("for the foreseeable future this shouldn't happen");
-
 	let params = Bolt11InvoiceParameters {
 		currency: Some(network),
 		amount_msats: amt_msat,
 		description: Bolt11InvoiceDescription::Hash(description_hash),
-		duration_since_epoch: Some(duration_since_epoch),
 		invoice_expiry_delta_secs: Some(invoice_expiry_delta_secs),
 		min_final_cltv_expiry_delta,
 		payment_hash: None,
@@ -414,7 +400,6 @@ where
 }
 
 
-#[cfg(feature = "std")]
 /// See [`create_invoice_from_channelmanager`]
 /// This version allows for providing custom [`PaymentHash`] and description hash for the invoice.
 ///
@@ -437,24 +422,17 @@ where
 	MR::Target: MessageRouter,
 	L::Target: Logger,
 {
-	use std::time::SystemTime;
-	let duration_since_epoch = SystemTime::now()
-		.duration_since(SystemTime::UNIX_EPOCH)
-		.expect("for the foreseeable future this shouldn't happen");
-
 	let params = Bolt11InvoiceParameters {
 		currency: Some(network),
 		amount_msats: amt_msat,
 		description: Bolt11InvoiceDescription::Hash(description_hash),
-		duration_since_epoch: Some(duration_since_epoch),
 		invoice_expiry_delta_secs: Some(invoice_expiry_delta_secs),
 		min_final_cltv_expiry_delta,
 		payment_hash: Some(payment_hash),
 	};
 	channelmanager.create_bolt11_invoice(params)
 }
 
-#[cfg(feature = "std")]
 /// See [`create_invoice_from_channelmanager`]
 /// This version allows for providing a custom [`PaymentHash`] for the invoice.
 /// This may be useful if you're building an on-chain swap or involving another protocol where
@@ -475,17 +453,11 @@ where
 	MR::Target: MessageRouter,
 	L::Target: Logger,
 {
-	use std::time::SystemTime;
-	let duration_since_epoch = SystemTime::now()
-		.duration_since(SystemTime::UNIX_EPOCH)
-		.expect("for the foreseeable future this shouldn't happen");
-
 	let description = Description::new(description).map_err(SignOrCreationError::CreationError)?;
 	let params = Bolt11InvoiceParameters {
 		currency: Some(network),
 		amount_msats: amt_msat,
 		description: Bolt11InvoiceDescription::Direct(description),
-		duration_since_epoch: Some(duration_since_epoch),
 		invoice_expiry_delta_secs: Some(invoice_expiry_delta_secs),
 		min_final_cltv_expiry_delta,
 		payment_hash: Some(payment_hash),