f - rename send_response_static_invoice_request and handle invoice om

Author: elnosh

lightning/src/events/mod.rs

@@ -1658,9 +1658,9 @@ pub enum Event {
 		/// The path to where invoice requests will be forwarded. If we receive an invoice
 		/// request, we'll forward it to the async recipient over this path in case the
 		/// recipient is online to provide a new invoice. This path should be persisted and
-		/// later provided to [`ChannelManager::send_response_static_invoice_request`].
+		/// later provided to [`ChannelManager::respond_to_static_invoice_request`].
 		///
-		/// [`ChannelManager::send_response_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::send_response_static_invoice_request
+		/// [`ChannelManager::respond_to_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::respond_to_static_invoice_request
 		invoice_request_path: BlindedMessagePath,
 		/// Useful for the recipient to replace a specific invoice stored by us as the static invoice
 		/// server.
@@ -1694,14 +1694,14 @@ pub enum Event {
 	///
 	/// If we previously persisted a [`StaticInvoice`] from an [`Event::PersistStaticInvoice`] that
 	/// matches the below `recipient_id` and `invoice_slot`, that invoice should be retrieved now
-	/// and forwarded to the payer via [`ChannelManager::send_response_static_invoice_request`].
+	/// and forwarded to the payer via [`ChannelManager::respond_to_static_invoice_request`].
 	/// The invoice request path previously persisted from [`Event::PersistStaticInvoice`] should
-	/// also be provided in [`ChannelManager::send_response_static_invoice_request`].
+	/// also be provided in [`ChannelManager::respond_to_static_invoice_request`].
 	///
 	/// [`ChannelManager::blinded_paths_for_async_recipient`]: crate::ln::channelmanager::ChannelManager::blinded_paths_for_async_recipient
 	/// [`ChannelManager::set_paths_to_static_invoice_server`]: crate::ln::channelmanager::ChannelManager::set_paths_to_static_invoice_server
 	/// [`InvoiceRequest`]: crate::offers::invoice_request::InvoiceRequest
-	/// [`ChannelManager::send_response_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::send_response_static_invoice_request
+	/// [`ChannelManager::respond_to_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::respond_to_static_invoice_request
 	StaticInvoiceRequested {
 		/// An identifier for the recipient previously surfaced in
 		/// [`Event::PersistStaticInvoice::recipient_id`]. Useful when paired with the `invoice_slot` to
@@ -1712,15 +1712,15 @@ pub enum Event {
 		/// retrieve the [`StaticInvoice`] requested by the payer.
 		invoice_slot: u16,
 		/// The path over which the [`StaticInvoice`] will be sent to the payer, which should be
-		/// provided to [`ChannelManager::send_response_static_invoice_request`] along with the invoice.
+		/// provided to [`ChannelManager::respond_to_static_invoice_request`] along with the invoice.
 		///
-		/// [`ChannelManager::send_response_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::send_response_static_invoice_request
+		/// [`ChannelManager::respond_to_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::respond_to_static_invoice_request
 		reply_path: Responder,
 		/// The invoice request that will be forwarded to the async recipient to give the
 		/// recipient a chance to provide an invoice in case it is online. It should be
-		/// provided to [`ChannelManager::send_response_static_invoice_request`].
+		/// provided to [`ChannelManager::respond_to_static_invoice_request`].
 		///
-		/// [`ChannelManager::send_response_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::send_response_static_invoice_request
+		/// [`ChannelManager::respond_to_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::respond_to_static_invoice_request
 		invoice_request: InvoiceRequest,
 	},
 	/// Indicates that a channel funding transaction constructed interactively is ready to be

lightning/src/ln/async_payments_tests.rs

@@ -223,7 +223,7 @@ fn pass_async_payments_oms(
 
 	always_online_recipient_counterparty
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			static_invoice,
 			reply_path,
 			invoice_request,
@@ -604,7 +604,7 @@ fn ignore_unexpected_static_invoice() {
 	// Check that the sender will ignore the unexpected static invoice.
 	nodes[1]
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			unexpected_static_invoice,
 			reply_path.clone(),
 			invoice_request.clone(),
@@ -626,7 +626,7 @@ fn ignore_unexpected_static_invoice() {
 	// held_htlc_available onion message.
 	nodes[1]
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			valid_static_invoice.clone(),
 			reply_path.clone(),
 			invoice_request.clone(),
@@ -649,7 +649,7 @@ fn ignore_unexpected_static_invoice() {
 	// Receiving a duplicate invoice will have no effect.
 	nodes[1]
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			valid_static_invoice,
 			reply_path,
 			invoice_request,
@@ -738,15 +738,15 @@ fn ignore_duplicate_invoice() {
 
 	always_online_node
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			static_invoice.clone(),
 			reply_path,
 			invoice_request,
 			invoice_flow_res.invoice_request_path.clone(),
 		)
 		.unwrap();
 
-	// After calling `send_response_static_invoice_request` the next two messages should be the
+	// After calling `respond_to_static_invoice_request` the next two messages should be the
 	// invoice request to the intended for the async recipient and the static invoice to the
 	// payer.
 	let invreq_om =
@@ -835,7 +835,7 @@ fn ignore_duplicate_invoice() {
 
 	always_online_node
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			static_invoice.clone(),
 			reply_path,
 			invoice_request,
@@ -857,15 +857,12 @@ fn ignore_duplicate_invoice() {
 	let invoice_om =
 		async_recipient.onion_messenger.next_onion_message_for_peer(sender_node_id).unwrap();
 
-	let (invoice, context) = match sender.onion_messenger.peel_onion_message(&invoice_om) {
-		Ok(PeeledOnion::Offers(OffersMessage::Invoice(invoice), context, _)) => (invoice, context),
+	let invoice = match sender.onion_messenger.peel_onion_message(&invoice_om) {
+		Ok(PeeledOnion::Offers(OffersMessage::Invoice(invoice), _, _)) => invoice,
 		_ => panic!(),
 	};
 
-	assert!(matches!(
-		sender.node.send_payment_for_bolt12_invoice(&invoice, context.as_ref()),
-		Ok(())
-	));
+	sender.onion_messenger.handle_onion_message(async_recipient_id, &invoice_om);
 
 	let mut events = sender.node.get_and_clear_pending_msg_events();
 	assert_eq!(events.len(), 1);
@@ -1008,7 +1005,7 @@ fn expired_static_invoice_fail() {
 
 	nodes[1]
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			static_invoice.clone(),
 			reply_path,
 			invoice_request,
@@ -1093,7 +1090,7 @@ fn timeout_unreleased_payment() {
 
 	server
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			static_invoice.clone(),
 			reply_path,
 			invoice_request,
@@ -2617,7 +2614,7 @@ fn invoice_request_forwarded_to_async_recipient() {
 
 	always_online_node
 		.node
-		.send_response_static_invoice_request(
+		.respond_to_static_invoice_request(
 			static_invoice,
 			reply_path,
 			invoice_request,

lightning/src/ln/channelmanager.rs

@@ -5296,7 +5296,7 @@ where
 	/// [`Event::StaticInvoiceRequested`]. Also forwards the payer's [`InvoiceRequest`] to the
 	/// async recipient, in case the recipient is online to provide the payer with a fresh
 	/// [`Bolt12Invoice`].
-	pub fn send_response_static_invoice_request(
+	pub fn respond_to_static_invoice_request(
 		&self, invoice: StaticInvoice, responder: Responder, invoice_request: InvoiceRequest,
 		invoice_request_path: BlindedMessagePath,
 	) -> Result<(), Bolt12SemanticError> {

lightning/src/offers/flow.rs

@@ -1132,13 +1132,13 @@ where
 	/// [`BlindedMessagePath`]: crate::blinded_path::message::BlindedMessagePath
 	/// [`Responder`]: crate::onion_message::messenger::Responder
 	pub fn enqueue_invoice_request_to_forward(
-		&self, invoice_request: InvoiceRequest, invoice_request_path: BlindedMessagePath,
+		&self, invoice_request: InvoiceRequest, destination: BlindedMessagePath,
 		reply_path: Responder,
 	) {
 		let mut pending_offers_messages = self.pending_offers_messages.lock().unwrap();
 		let message = OffersMessage::InvoiceRequest(invoice_request);
 		let instructions = MessageSendInstructions::WithSpecifiedReplyPath {
-			destination: Destination::BlindedPath(invoice_request_path),
+			destination: Destination::BlindedPath(destination),
 			reply_path: reply_path.into_blinded_path(),
 		};
 		pending_offers_messages.push((message, instructions));