f - use absolute expiry in add_new_awaiting_invoice

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -7118,7 +7118,7 @@ where
 	/// [`Refund`]: crate::offers::refund::Refund
 	/// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
 	pub fn create_refund_builder(
-		&self, description: String, amount_msats: u64, absolute_expiry: Option<Duration>,
+		&self, description: String, amount_msats: u64, absolute_expiry: Duration,
 		payment_id: PaymentId, retry_strategy: Retry, max_total_routing_fee_msat: Option<u64>
 	) -> Result<RefundBuilder<secp256k1::All>, Bolt12SemanticError> {
 		let node_id = self.get_our_node_id();
@@ -7129,21 +7129,13 @@ where
 		// TODO: Set blinded paths
 		let builder = RefundBuilder::deriving_payer_id(
 			description, node_id, expanded_key, entropy, secp_ctx, amount_msats, payment_id
-		)?.chain_hash(self.chain_hash);
-
-		let builder = match absolute_expiry {
-			Some(absolute_expiry) => builder.absolute_expiry(absolute_expiry),
-			None => builder,
-		};
-
-		const SECONDS_PER_TIMER_TICK: u64 = 60;
-		let timer_ticks_before_expiration =
-			absolute_expiry.map(|expiry| expiry.as_secs() / SECONDS_PER_TIMER_TICK);
+		)?
+			.chain_hash(self.chain_hash)
+			.absolute_expiry(absolute_expiry);
 
 		self.pending_outbound_payments
-			.add_new_awaiting_invoice_for_refund(
-				payment_id, retry_strategy, max_total_routing_fee_msat,
-				timer_ticks_before_expiration
+			.add_new_awaiting_invoice(
+				payment_id, absolute_expiry, retry_strategy, max_total_routing_fee_msat,
 			)
 			.map_err(|_| Bolt12SemanticError::DuplicatePaymentId)?;
 

lightning/src/ln/outbound_payment.rs

@@ -1268,8 +1268,7 @@ impl OutboundPayments {
 		(payment, onion_session_privs)
 	}
 
-	#[allow(unused)]
-	fn add_new_awaiting_invoice(
+	pub(super) fn add_new_awaiting_invoice(
 		&self, payment_id: PaymentId, absolute_expiry: Duration, retry_strategy: Retry,
 		max_total_routing_fee_msat: Option<u64>
 	) -> Result<(), ()> {