Introduce create_blinded_paths in flow.rs

1. This allow removing an extra function from commons, simplifying the
   flow trait.

Author: shaavan

lightning/src/ln/channelmanager.rs

@@ -33,7 +33,7 @@ use bitcoin::secp256k1::Secp256k1;
 use bitcoin::{secp256k1, Sequence, Weight};
 
 use crate::events::FundingInfo;
-use crate::blinded_path::message::{AsyncPaymentsContext, MessageContext, MessageForwardNode};
+use crate::blinded_path::message::{AsyncPaymentsContext, MessageForwardNode};
 use crate::blinded_path::NodeIdLookUp;
 use crate::blinded_path::message::BlindedMessagePath;
 use crate::blinded_path::payment::{BlindedPaymentPath, PaymentConstraints, PaymentContext, UnauthenticatedReceiveTlvs};
@@ -9659,10 +9659,6 @@ where
 		self.pending_outbound_payments.release_invoice_requests_awaiting_invoice()
 	}
 
-	fn create_blinded_paths(&self, context: MessageContext) -> Result<Vec<BlindedMessagePath>, ()> {
-		self.create_blinded_paths(context)
-	}
-
 	fn enqueue_invoice_request(&self, invoice_request: InvoiceRequest, reply_paths: Vec<BlindedMessagePath>) -> Result<(), Bolt12SemanticError> {
 		self.enqueue_invoice_request(invoice_request, reply_paths)
 	}
@@ -9869,6 +9865,7 @@ where
 	/// [`MessageRouter::create_blinded_paths`].
 	///
 	/// Errors if the `MessageRouter` errors.
+	#[cfg(async_payments)]
 	fn create_blinded_paths(&self, context: MessageContext) -> Result<Vec<BlindedMessagePath>, ()> {
 		let recipient = self.get_our_node_id();
 		let secp_ctx = &self.secp_ctx;

lightning/src/offers/flow.rs

@@ -167,14 +167,6 @@ pub trait OffersMessageCommons {
 		&self,
 	) -> Vec<(PaymentId, RetryableInvoiceRequest)>;
 
-	/// Creates a collection of blinded paths by delegating to
-	/// [`MessageRouter::create_blinded_paths`].
-	///
-	/// Errors if the `MessageRouter` errors.
-	///
-	/// [`MessageRouter::create_blinded_paths`]: crate::onion_message::messenger::MessageRouter::create_blinded_paths
-	fn create_blinded_paths(&self, context: MessageContext) -> Result<Vec<BlindedMessagePath>, ()>;
-
 	/// Enqueue invoice request
 	fn enqueue_invoice_request(
 		&self, invoice_request: InvoiceRequest, reply_paths: Vec<BlindedMessagePath>,
@@ -686,7 +678,7 @@ where
 		if absolute_expiry.unwrap_or(Duration::MAX) <= max_short_lived_absolute_expiry {
 			self.create_compact_blinded_paths(context)
 		} else {
-			self.commons.create_blinded_paths(MessageContext::Offers(context))
+			self.create_blinded_paths(MessageContext::Offers(context))
 		}
 	}
 
@@ -701,6 +693,26 @@ where
 		now
 	}
 
+	/// Creates a collection of blinded paths by delegating to
+	/// [`MessageRouter::create_blinded_paths`].
+	///
+	/// Errors if the `MessageRouter` errors.
+	///
+	/// [`MessageRouter::create_blinded_paths`]: crate::onion_message::messenger::MessageRouter::create_blinded_paths
+	pub fn create_blinded_paths(
+		&self, context: MessageContext,
+	) -> Result<Vec<BlindedMessagePath>, ()> {
+		let recipient = self.get_our_node_id();
+		let secp_ctx = &self.secp_ctx;
+
+		let peers =
+			self.commons.get_peer_for_blinded_path().into_iter().map(|node| node.node_id).collect();
+
+		self.message_router
+			.create_blinded_paths(recipient, context, peers, secp_ctx)
+			.and_then(|paths| (!paths.is_empty()).then(|| paths).ok_or(()))
+	}
+
 	/// Creates a collection of blinded paths by delegating to
 	/// [`MessageRouter::create_compact_blinded_paths`].
 	///
@@ -771,10 +783,8 @@ where
 			nonce,
 			hmac: Some(hmac),
 		});
-		let reply_paths = self
-			.commons
-			.create_blinded_paths(context)
-			.map_err(|_| Bolt12SemanticError::MissingPaths)?;
+		let reply_paths =
+			self.create_blinded_paths(context).map_err(|_| Bolt12SemanticError::MissingPaths)?;
 
 		create_pending_payment(&invoice_request, nonce)?;
 
@@ -1043,7 +1053,7 @@ where
 				nonce,
 				hmac: Some(hmac),
 			});
-			match self.commons.create_blinded_paths(context) {
+			match self.create_blinded_paths(context) {
 				Ok(reply_paths) => {
 					match self.commons.enqueue_invoice_request(invoice_request, reply_paths) {
 						Ok(_) => {},
@@ -1396,7 +1406,6 @@ where
 					hmac,
 				});
 				let reply_paths = self
-					.commons
 					.create_blinded_paths(context)
 					.map_err(|_| Bolt12SemanticError::MissingPaths)?;
 
@@ -1484,8 +1493,7 @@ where
 			name,
 			&*self.entropy_source,
 		)?;
-		let reply_paths =
-			self.commons.create_blinded_paths(MessageContext::DNSResolver(context))?;
+		let reply_paths = self.create_blinded_paths(MessageContext::DNSResolver(context))?;
 		let expiration = StaleExpiration::TimerTicks(1);
 		self.commons.add_new_awaiting_offer(
 			payment_id,