Merge pull request #3517 from valentinewallace/2025-01-async-receive-prefactor

Async receive prefactor

Author: TheBlueMatt

fuzz/src/onion_message.rs

@@ -122,7 +122,8 @@ struct TestAsyncPaymentsMessageHandler {}
 
 impl AsyncPaymentsMessageHandler for TestAsyncPaymentsMessageHandler {
 	fn handle_held_htlc_available(
-		&self, _message: HeldHtlcAvailable, responder: Option<Responder>,
+		&self, _message: HeldHtlcAvailable, _context: AsyncPaymentsContext,
+		responder: Option<Responder>,
 	) -> Option<(ReleaseHeldHtlc, ResponseInstruction)> {
 		let responder = match responder {
 			Some(resp) => resp,

lightning/src/events/mod.rs

@@ -561,8 +561,8 @@ pub enum PaymentFailureReason {
 	#[cfg_attr(feature = "std", doc = "")]
 	#[cfg_attr(feature = "std", doc = "[`Retry::Timeout`]: crate::ln::channelmanager::Retry::Timeout")]
 	RetriesExhausted,
-	/// The payment expired while retrying, based on the provided
-	/// [`PaymentParameters::expiry_time`].
+	/// Either the BOLT 12 invoice was expired by the time we received it or the payment expired while
+	/// retrying based on the provided [`PaymentParameters::expiry_time`].
 	///
 	/// Also used for [`InvoiceRequestExpired`] when downgrading to version prior to 0.0.124.
 	///