f - break up forwarding of invoice request and static invoice

Author: elnosh

lightning/src/events/mod.rs

@@ -1655,14 +1655,12 @@ pub enum Event {
 		/// The invoice that should be persisted and later provided to payers when handling a future
 		/// [`Event::StaticInvoiceRequested`].
 		invoice: StaticInvoice,
-		/// The path to where invoice requests will be forwarded. As a static invoice
-		/// server, if we receive an invoice request on behalf of an async recipient, a static
-		/// invoice will be provided to the payer. However, we'll also forward the invoice
-		/// request to this path to the async recipient in case it is online so that the
-		/// recipient can provide a new invoice. This path should be persisted and later
-		/// provided to [`ChannelManager::send_response_static_invoice_request`].
-		///
-		/// [`ChannelManager::send_response_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::send_response_static_invoice_request
+		/// 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 it is online
+		/// to provide a new invoice. This path should be persisted and later provided to
+		/// [`ChannelManager::forward_invoice_request`].
+		///
+		/// [`ChannelManager::forward_invoice_request`]: crate::ln::channelmanager::ChannelManager::forward_invoice_request
 		invoice_request_path: BlindedMessagePath,
 		/// Useful for the recipient to replace a specific invoice stored by us as the static invoice
 		/// server.
@@ -1694,16 +1692,17 @@ pub enum Event {
 	/// [`ChannelManager::blinded_paths_for_async_recipient`] and the recipient was configured with
 	/// them via [`ChannelManager::set_paths_to_static_invoice_server`].
 	///
-	/// 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`].
-	/// The invoice request path previously persisted from [`Event::PersistStaticInvoice`] should
-	/// also be provided in [`ChannelManager::send_response_static_invoice_request`].
+	/// If we previously persisted a [`StaticInvoice`] and an `invoice_request_path` from an
+	/// [`Event::PersistStaticInvoice`] that matches the below `recipient_id` and `invoice_slot`,
+	/// the [`InvoiceRequest`] should be forwarded to the async recipient over the
+	/// `invoice_request_path` via [`ChannelManager::forward_invoice_request`] and the static
+	/// invoice should be sent to the payer via [`ChannelManager::send_static_invoice`].
 	///
 	/// [`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::send_static_invoice`]: crate::ln::channelmanager::ChannelManager::send_static_invoice
+	/// [`ChannelManager::forward_invoice_request`]: crate::ln::channelmanager::ChannelManager::forward_invoice_request
 	StaticInvoiceRequested {
 		/// An identifier for the recipient previously surfaced in
 		/// [`Event::PersistStaticInvoice::recipient_id`]. Useful when paired with the `invoice_slot` to
@@ -1714,14 +1713,14 @@ 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::send_static_invoice`] along with the invoice.
 		///
-		/// [`ChannelManager::send_response_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::send_response_static_invoice_request
+		/// [`ChannelManager::send_static_invoice`]: crate::ln::channelmanager::ChannelManager::send_static_invoice
 		reply_path: Responder,
 		/// The invoice request that will be forwarded to the async recipient to give it a
-		/// chance to provide an invoice in case it is online. It should be provided to [`ChannelManager::send_response_static_invoice_request`].
+		/// chance to provide an invoice in case it is online. It should be provided to [`ChannelManager::forward_invoice_request`].
 		///
-		/// [`ChannelManager::send_response_static_invoice_request`]: crate::ln::channelmanager::ChannelManager::send_response_static_invoice_request
+		/// [`ChannelManager::forward_invoice_request`]: crate::ln::channelmanager::ChannelManager::forward_invoice_request
 		invoice_request: InvoiceRequest,
 	},
 	/// Indicates that a channel funding transaction constructed interactively is ready to be