Use cached peers in OffersMessageFlow

In the previous commit, we started caching the set of peers in the
OffersMessageFlow that are used when creating blinded paths. Here we start
using that cache and stop passing in the peers for every method.

Author: valentinewallace

lightning/src/ln/async_payments_tests.rs

@@ -276,7 +276,6 @@ fn create_static_invoice_builder<'a>(
 			payment_secret,
 			relative_expiry_secs,
 			recipient.node.list_usable_channels(),
-			recipient.node.test_get_peers_for_blinded_path(),
 		)
 		.unwrap()
 }

lightning/src/ln/channelmanager.rs

@@ -5377,12 +5377,10 @@ where
 	}
 
 	fn check_refresh_async_receive_offer_cache(&self, timer_tick_occurred: bool) {
-		let peers = self.get_peers_for_blinded_path();
 		let channels = self.list_usable_channels();
 		let entropy = &*self.entropy_source;
 		let router = &*self.router;
 		let refresh_res = self.flow.check_refresh_async_receive_offer_cache(
-			peers,
 			channels,
 			entropy,
 			router,
@@ -5463,10 +5461,7 @@ where
 					);
 				}
 			} else {
-				let reply_path = HeldHtlcReplyPath::ToUs {
-					payment_id,
-					peers: self.get_peers_for_blinded_path(),
-				};
+				let reply_path = HeldHtlcReplyPath::ToUs { payment_id };
 				let enqueue_held_htlc_available_res =
 					self.flow.enqueue_held_htlc_available(invoice, reply_path);
 				if enqueue_held_htlc_available_res.is_err() {
@@ -12232,9 +12227,7 @@ macro_rules! create_offer_builder { ($self: ident, $builder: ty) => {
 	/// [`Offer`]: crate::offers::offer::Offer
 	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
 	pub fn create_offer_builder(&$self) -> Result<$builder, Bolt12SemanticError> {
-		let builder = $self.flow.create_offer_builder(
-			&*$self.entropy_source, $self.get_peers_for_blinded_path()
-		)?;
+		let builder = $self.flow.create_offer_builder(&*$self.entropy_source)?;
 
 		Ok(builder.into())
 	}
@@ -12257,9 +12250,7 @@ macro_rules! create_offer_builder { ($self: ident, $builder: ty) => {
 	where
 		ME::Target: MessageRouter,
 	{
-		let builder = $self.flow.create_offer_builder_using_router(
-			router, &*$self.entropy_source, $self.get_peers_for_blinded_path()
-		)?;
+		let builder = $self.flow.create_offer_builder_using_router(router, &*$self.entropy_source)?;
 
 		Ok(builder.into())
 	}
@@ -12313,8 +12304,7 @@ macro_rules! create_refund_builder { ($self: ident, $builder: ty) => {
 		let entropy = &*$self.entropy_source;
 
 		let builder = $self.flow.create_refund_builder(
-			entropy, amount_msats, absolute_expiry,
-			payment_id, $self.get_peers_for_blinded_path()
+			entropy, amount_msats, absolute_expiry, payment_id
 		)?;
 
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop($self);
@@ -12357,8 +12347,7 @@ macro_rules! create_refund_builder { ($self: ident, $builder: ty) => {
 		let entropy = &*$self.entropy_source;
 
 		let builder = $self.flow.create_refund_builder_using_router(
-			router, entropy, amount_msats, absolute_expiry,
-			payment_id, $self.get_peers_for_blinded_path()
+			router, entropy, amount_msats, absolute_expiry, payment_id
 		)?;
 
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop($self);
@@ -12430,8 +12419,7 @@ where
 	pub fn set_paths_to_static_invoice_server(
 		&self, paths_to_static_invoice_server: Vec<BlindedMessagePath>,
 	) -> Result<(), ()> {
-		let peers = self.get_peers_for_blinded_path();
-		self.flow.set_paths_to_static_invoice_server(paths_to_static_invoice_server, peers)?;
+		self.flow.set_paths_to_static_invoice_server(paths_to_static_invoice_server)?;
 
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);
 		Ok(())
@@ -12559,10 +12547,7 @@ where
 		let invoice_request = builder.build_and_sign()?;
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);
 
-		self.flow.enqueue_invoice_request(
-			invoice_request.clone(), payment_id, nonce,
-			self.get_peers_for_blinded_path()
-		)?;
+		self.flow.enqueue_invoice_request(invoice_request.clone(), payment_id, nonce,)?;
 
 		create_pending_payment(&invoice_request, nonce)
 	}
@@ -12611,7 +12596,7 @@ where
 
 				let invoice = builder.allow_mpp().build_and_sign(secp_ctx)?;
 
-				self.flow.enqueue_invoice(invoice.clone(), refund, self.get_peers_for_blinded_path())?;
+				self.flow.enqueue_invoice(invoice.clone(), refund)?;
 
 				Ok(invoice)
 			},
@@ -12687,14 +12672,7 @@ where
 			payer_note,
 		)?;
 
-		self.flow
-			.enqueue_dns_onion_message(
-				onion_message,
-				context,
-				dns_resolvers,
-				self.get_peers_for_blinded_path(),
-			)
-			.map_err(|_| ())
+		self.flow.enqueue_dns_onion_message(onion_message, context, dns_resolvers).map_err(|_| ())
 	}
 
 	/// Gets a payment secret and payment hash for use in an invoice given to a third party wishing
@@ -12835,8 +12813,7 @@ where
 	pub fn blinded_paths_for_async_recipient(
 		&self, recipient_id: Vec<u8>, relative_expiry: Option<Duration>,
 	) -> Result<Vec<BlindedMessagePath>, ()> {
-		let peers = self.get_peers_for_blinded_path();
-		self.flow.blinded_paths_for_async_recipient(recipient_id, relative_expiry, peers)
+		self.flow.blinded_paths_for_async_recipient(recipient_id, relative_expiry)
 	}
 
 	pub(super) fn duration_since_epoch(&self) -> Duration {
@@ -12870,11 +12847,6 @@ where
 			.collect::<Vec<_>>()
 	}
 
-	#[cfg(test)]
-	pub(super) fn test_get_peers_for_blinded_path(&self) -> Vec<MessageForwardNode> {
-		self.get_peers_for_blinded_path()
-	}
-
 	#[cfg(test)]
 	/// Creates multi-hop blinded payment paths for the given `amount_msats` by delegating to
 	/// [`Router::create_blinded_payment_paths`].
@@ -14608,9 +14580,8 @@ where
 		{
 			let RetryableInvoiceRequest { invoice_request, nonce, .. } = retryable_invoice_request;
 
-			let peers = self.get_peers_for_blinded_path();
 			let enqueue_invreq_res =
-				self.flow.enqueue_invoice_request(invoice_request, payment_id, nonce, peers);
+				self.flow.enqueue_invoice_request(invoice_request, payment_id, nonce);
 			if enqueue_invreq_res.is_err() {
 				log_warn!(
 					self.logger,
@@ -14818,9 +14789,8 @@ where
 		&self, message: OfferPathsRequest, context: AsyncPaymentsContext,
 		responder: Option<Responder>,
 	) -> Option<(OfferPaths, ResponseInstruction)> {
-		let peers = self.get_peers_for_blinded_path();
 		let (message, reply_path_context) =
-			match self.flow.handle_offer_paths_request(&message, context, peers) {
+			match self.flow.handle_offer_paths_request(&message, context) {
 				Some(msg) => msg,
 				None => return None,
 			};
@@ -14838,7 +14808,6 @@ where
 			message,
 			context,
 			responder.clone(),
-			self.get_peers_for_blinded_path(),
 			self.list_usable_channels(),
 			&*self.entropy_source,
 			&*self.router,