Introduce enqueue_invoice_request Function

1. Separate the logic of forming `invoice_request` messages from
   `invoice_request` and `reply_paths` and enqueueing them into a
   separate function.
2. This logic will be reused in the following commit when reforming
   `invoice_request` messages for retrying.

Author: shaavan

lightning/src/ln/channelmanager.rs

@@ -64,7 +64,7 @@ use crate::ln::outbound_payment::{OutboundPayments, PaymentAttempts, PendingOutb
 use crate::ln::wire::Encode;
 use crate::offers::invoice::{Bolt12Invoice, DEFAULT_RELATIVE_EXPIRY, DerivedSigningPubkey, ExplicitSigningPubkey, InvoiceBuilder, UnsignedBolt12Invoice};
 use crate::offers::invoice_error::InvoiceError;
-use crate::offers::invoice_request::{DerivedPayerId, InvoiceRequestBuilder};
+use crate::offers::invoice_request::{DerivedPayerId, InvoiceRequest, InvoiceRequestBuilder};
 use crate::offers::nonce::Nonce;
 use crate::offers::offer::{Offer, OfferBuilder};
 use crate::offers::parse::Bolt12SemanticError;
@@ -9066,11 +9066,19 @@ where
 			)
 			.map_err(|_| Bolt12SemanticError::DuplicatePaymentId)?;
 
+		self.enqueue_invoice_request(invoice_request, reply_paths)
+	}
+
+	fn enqueue_invoice_request(
+		&self,
+		invoice_request: InvoiceRequest,
+		reply_paths: Vec<BlindedMessagePath>,
+	) -> Result<(), Bolt12SemanticError> {
 		let mut pending_offers_messages = self.pending_offers_messages.lock().unwrap();
-		if !offer.paths().is_empty() {
+		if !invoice_request.paths().is_empty() {
 			reply_paths
 				.iter()
-				.flat_map(|reply_path| offer.paths().iter().map(move |path| (path, reply_path)))
+				.flat_map(|reply_path| invoice_request.paths().iter().map(move |path| (path, reply_path)))
 				.take(OFFERS_MESSAGE_REQUEST_LIMIT)
 				.for_each(|(path, reply_path)| {
 					let message = new_pending_onion_message(
@@ -9080,7 +9088,7 @@ where
 					);
 					pending_offers_messages.push(message);
 				});
-		} else if let Some(signing_pubkey) = offer.signing_pubkey() {
+		} else if let Some(signing_pubkey) = invoice_request.signing_pubkey() {
 			for reply_path in reply_paths {
 				let message = new_pending_onion_message(
 					OffersMessage::InvoiceRequest(invoice_request.clone()),