TODO(delete): pass payment id into AsyncPaymentsMessageHandler

Will be replaced by lightningdevkit#3085.

Author: valentinewallace

fuzz/src/onion_message.rs

@@ -7,6 +7,7 @@ use bitcoin::secp256k1::schnorr;
 use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};
 
 use lightning::blinded_path::{BlindedPath, EmptyNodeIdLookUp};
+use lightning::ln::channelmanager::PaymentId;
 use lightning::ln::features::InitFeatures;
 use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
 use lightning::ln::script::ShutdownScript;
@@ -123,7 +124,7 @@ impl AsyncPaymentsMessageHandler for TestAsyncPaymentsMessageHandler {
 		responder
 			.respond(ReleaseHeldHtlc { payment_release_secret: message.payment_release_secret })
 	}
-	fn release_held_htlc(&self, _message: ReleaseHeldHtlc) {}
+	fn release_held_htlc(&self, _message: ReleaseHeldHtlc, _payment_id: Option<PaymentId>) {}
 }
 
 #[derive(Debug)]

lightning/src/ln/peer_handler.rs

@@ -152,11 +152,11 @@ impl OffersMessageHandler for IgnoringMessageHandler {
 }
 impl AsyncPaymentsMessageHandler for IgnoringMessageHandler {
 	fn held_htlc_available(
-		&self, _message: HeldHtlcAvailable, _responder: Option<Responder>,
+		&self, _message: HeldHtlcAvailable, _responder: Option<Responder>
 	) -> ResponseInstruction<ReleaseHeldHtlc> {
 		ResponseInstruction::NoResponse
 	}
-	fn release_held_htlc(&self, _message: ReleaseHeldHtlc) {}
+	fn release_held_htlc(&self, _message: ReleaseHeldHtlc, _payment_id: Option<PaymentId>) {}
 }
 impl CustomOnionMessageHandler for IgnoringMessageHandler {
 	type CustomMessage = Infallible;

lightning/src/onion_message/async_payments.rs

@@ -10,6 +10,7 @@
 //! Message handling for async payments.
 
 use crate::io;
+use crate::ln::channelmanager::PaymentId;
 use crate::ln::msgs::DecodeError;
 #[cfg(not(c_bindings))]
 use crate::onion_message::messenger::PendingOnionMessage;
@@ -34,7 +35,7 @@ pub trait AsyncPaymentsMessageHandler {
 
 	/// Handle a [`ReleaseHeldHtlc`] message. If authentication of the message succeeds, an HTLC
 	/// should be released to the corresponding payee.
-	fn release_held_htlc(&self, message: ReleaseHeldHtlc);
+	fn release_held_htlc(&self, message: ReleaseHeldHtlc, payment_id: Option<PaymentId>);
 
 	/// Release any [`AsyncPaymentsMessage`]s that need to be sent.
 	///

lightning/src/onion_message/functional_tests.rs

@@ -90,7 +90,7 @@ impl AsyncPaymentsMessageHandler for TestAsyncPaymentsMessageHandler {
 	) -> ResponseInstruction<ReleaseHeldHtlc> {
 		ResponseInstruction::NoResponse
 	}
-	fn release_held_htlc(&self, _message: ReleaseHeldHtlc) {}
+	fn release_held_htlc(&self, _message: ReleaseHeldHtlc, _payment_id: Option<PaymentId>) {}
 }
 
 #[derive(Clone, Debug, PartialEq)]

lightning/src/onion_message/messenger.rs

@@ -1467,7 +1467,7 @@ where
 					},
 					#[cfg(async_payments)]
 					ParsedOnionMessageContents::AsyncPayments(AsyncPaymentsMessage::ReleaseHeldHtlc(msg)) => {
-						self.async_payments_handler.release_held_htlc(msg);
+						self.async_payments_handler.release_held_htlc(msg, payment_id);
 					},
 					ParsedOnionMessageContents::Custom(msg) => {
 						let response_instructions = self.custom_handler.handle_custom_message(msg, responder);