Pass full message context into ChanMan blinded path util.

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -8825,7 +8825,7 @@ where
 		};
 		let invoice_request = builder.build_and_sign()?;
 
-		let context = OffersContext::OutboundPayment { payment_id };
+		let context = MessageContext::Offers(OffersContext::OutboundPayment { payment_id });
 		let reply_path = self.create_blinded_path(context).map_err(|_| Bolt12SemanticError::MissingPaths)?;
 
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);
@@ -8926,7 +8926,7 @@ where
 				)?;
 				let builder: InvoiceBuilder<DerivedSigningPubkey> = builder.into();
 				let invoice = builder.allow_mpp().build_and_sign(secp_ctx)?;
-				let reply_path = self.create_blinded_path(OffersContext::Unknown {})
+				let reply_path = self.create_blinded_path(MessageContext::Offers(OffersContext::Unknown {}))
 					.map_err(|_| Bolt12SemanticError::MissingPaths)?;
 
 				let mut pending_offers_messages = self.pending_offers_messages.lock().unwrap();
@@ -9067,7 +9067,7 @@ where
 		if absolute_expiry.unwrap_or(Duration::MAX) <= max_short_lived_absolute_expiry {
 			self.create_compact_blinded_path(context)
 		} else {
-			self.create_blinded_path(context)
+			self.create_blinded_path(MessageContext::Offers(context))
 		}
 	}
 
@@ -9087,7 +9087,7 @@ where
 	/// Creates a blinded path by delegating to [`MessageRouter::create_blinded_paths`].
 	///
 	/// Errors if the `MessageRouter` errors or returns an empty `Vec`.
-	fn create_blinded_path(&self, context: OffersContext) -> Result<BlindedPath, ()> {
+	fn create_blinded_path(&self, context: MessageContext) -> Result<BlindedPath, ()> {
 		let recipient = self.get_our_node_id();
 		let secp_ctx = &self.secp_ctx;
 
@@ -9100,7 +9100,7 @@ where
 			.collect::<Vec<_>>();
 
 		self.router
-			.create_blinded_paths(recipient, MessageContext::Offers(context), peers, secp_ctx)
+			.create_blinded_paths(recipient, context, peers, secp_ctx)
 			.and_then(|paths| paths.into_iter().next().ok_or(()))
 	}