Expose hold times in the PaymentPathFailed event during test

Author: joostjager

lightning-background-processor/src/lib.rs

@@ -2699,6 +2699,7 @@ mod tests {
 				short_channel_id: Some(scored_scid),
 				error_code: None,
 				error_data: None,
+				hold_times: Vec::new(),
 			});
 			let event = $receive.expect("PaymentPathFailed not handled within deadline");
 			match event {
@@ -2718,6 +2719,7 @@ mod tests {
 				short_channel_id: None,
 				error_code: None,
 				error_data: None,
+				hold_times: Vec::new(),
 			});
 			let event = $receive.expect("PaymentPathFailed not handled within deadline");
 			match event {

lightning/src/events/mod.rs

@@ -1131,6 +1131,8 @@ pub enum Event {
 		error_code: Option<u16>,
 		#[cfg(any(test, feature = "_test_utils"))]
 		error_data: Option<Vec<u8>>,
+		#[cfg(any(test, feature = "_test_utils"))]
+		hold_times: Vec<u32>,
 	},
 	/// Indicates that a probe payment we sent returned successful, i.e., only failed at the destination.
 	///
@@ -1696,12 +1698,16 @@ impl Writeable for Event {
 				ref error_code,
 				#[cfg(any(test, feature = "_test_utils"))]
 				ref error_data,
+				#[cfg(any(test, feature = "_test_utils"))]
+				ref hold_times,
 			} => {
 				3u8.write(writer)?;
 				#[cfg(any(test, feature = "_test_utils"))]
 				error_code.write(writer)?;
 				#[cfg(any(test, feature = "_test_utils"))]
 				error_data.write(writer)?;
+				#[cfg(any(test, feature = "_test_utils"))]
+				hold_times.write(writer)?;
 				write_tlv_fields!(writer, {
 					(0, payment_hash, required),
 					(1, None::<NetworkUpdate>, option), // network_update in LDK versions prior to 0.0.114
@@ -2121,6 +2127,8 @@ impl MaybeReadable for Event {
 					let error_code = Readable::read(reader)?;
 					#[cfg(any(test, feature = "_test_utils"))]
 					let error_data = Readable::read(reader)?;
+					#[cfg(any(test, feature = "_test_utils"))]
+					let hold_times = Readable::read(reader)?;
 					let mut payment_hash = PaymentHash([0; 32]);
 					let mut payment_failed_permanently = false;
 					let mut network_update = None;
@@ -2154,6 +2162,8 @@ impl MaybeReadable for Event {
 						error_code,
 						#[cfg(any(test, feature = "_test_utils"))]
 						error_data,
+						#[cfg(any(test, feature = "_test_utils"))]
+						hold_times,
 					}))
 				};
 				f()

lightning/src/ln/outbound_payment.rs

@@ -1650,6 +1650,8 @@ impl OutboundPayments {
 					error_code: None,
 					#[cfg(any(test, feature = "_test_utils"))]
 					error_data: None,
+					#[cfg(any(test, feature = "_test_utils"))]
+					hold_times: Vec::new(),
 				};
 				events.push_back((event, None));
 			}
@@ -2278,6 +2280,7 @@ impl OutboundPayments {
 			onion_error_code,
 			onion_error_data,
 			failed_within_blinded_path,
+			hold_times,
 			..
 		} = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 		#[cfg(not(any(test, feature = "_test_utils")))]
@@ -2414,6 +2417,8 @@ impl OutboundPayments {
 					error_code: onion_error_code.map(|f| f.failure_code()),
 					#[cfg(any(test, feature = "_test_utils"))]
 					error_data: onion_error_data,
+					#[cfg(any(test, feature = "_test_utils"))]
+					hold_times,
 				}
 			}
 		};

lightning/src/util/ser.rs

@@ -1089,6 +1089,7 @@ impl_readable_for_vec!(crate::routing::router::BlindedTail);
 impl_for_vec!(crate::routing::router::TrampolineHop);
 impl_for_vec_with_element_length_prefix!(crate::ln::msgs::UpdateAddHTLC);
 impl_writeable_for_vec_with_element_length_prefix!(&crate::ln::msgs::UpdateAddHTLC);
+impl_for_vec!(u32);
 
 impl Writeable for Vec<Witness> {
 	#[inline]