Prepare tests for deprecating RAA-blockers

And tweak a few test utils to have clearer error messages.

Splitting up tests with may variants makes it easier to debug tests.

Tests marked "legacy" have test coverage replicated in the next commit,
that does not rely on RAA blocking actions.

Author: valentinewallace

lightning/src/chain/channelmonitor.rs

@@ -193,7 +193,7 @@ fn push_monitor_event(
 }
 
 /// An event to be processed by the ChannelManager.
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub enum MonitorEvent {
 	/// A monitor event containing an HTLCUpdate.
 	HTLCEvent(HTLCUpdate),
@@ -255,7 +255,7 @@ impl_writeable_tlv_based_enum_upgradable_legacy!(MonitorEvent,
 /// Simple structure sent back by `chain::Watch` when an HTLC from a forward channel is detected on
 /// chain. Used to update the corresponding HTLC in the backward channel. Failing to pass the
 /// preimage claim backward will lead to loss of funds.
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct HTLCUpdate {
 	pub(crate) payment_hash: PaymentHash,
 	pub(crate) payment_preimage: Option<PaymentPreimage>,

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -3774,7 +3774,7 @@ fn test_inverted_mon_completion_order() {
 	do_test_inverted_mon_completion_order(false, false);
 }
 
-fn do_test_durable_preimages_on_closed_channel(
+fn do_test_durable_preimages_on_closed_channel_legacy(
 	close_chans_before_reload: bool, close_only_a: bool, hold_post_reload_mon_update: bool,
 ) {
 	// Test that we can apply a `ChannelMonitorUpdate` with a payment preimage even if the channel
@@ -4014,16 +4014,31 @@ fn do_test_durable_preimages_on_closed_channel(
 }
 
 #[test]
-fn test_durable_preimages_on_closed_channel() {
-	do_test_durable_preimages_on_closed_channel(true, true, true);
-	do_test_durable_preimages_on_closed_channel(true, true, false);
-	do_test_durable_preimages_on_closed_channel(true, false, true);
-	do_test_durable_preimages_on_closed_channel(true, false, false);
-	do_test_durable_preimages_on_closed_channel(false, false, true);
-	do_test_durable_preimages_on_closed_channel(false, false, false);
+fn test_durable_preimages_on_closed_channel_legacy_a() {
+	do_test_durable_preimages_on_closed_channel_legacy(true, true, true);
+}
+#[test]
+fn test_durable_preimages_on_closed_channel_legacy_b() {
+	do_test_durable_preimages_on_closed_channel_legacy(true, true, false);
+}
+#[test]
+fn test_durable_preimages_on_closed_channel_legacy_c() {
+	do_test_durable_preimages_on_closed_channel_legacy(true, false, true);
+}
+#[test]
+fn test_durable_preimages_on_closed_channel_legacy_d() {
+	do_test_durable_preimages_on_closed_channel_legacy(true, false, false);
+}
+#[test]
+fn test_durable_preimages_on_closed_channel_legacy_e() {
+	do_test_durable_preimages_on_closed_channel_legacy(false, false, true);
+}
+#[test]
+fn test_durable_preimages_on_closed_channel_legacy_f() {
+	do_test_durable_preimages_on_closed_channel_legacy(false, false, false);
 }
 
-fn do_test_reload_mon_update_completion_actions(close_during_reload: bool) {
+fn do_test_reload_mon_update_completion_actions_legacy(close_during_reload: bool) {
 	// Test that if a `ChannelMonitorUpdate` completes but a `ChannelManager` isn't serialized
 	// before restart we run the monitor update completion action on startup.
 	let chanmon_cfgs = create_chanmon_cfgs(3);
@@ -4139,9 +4154,9 @@ fn do_test_reload_mon_update_completion_actions(close_during_reload: bool) {
 }
 
 #[test]
-fn test_reload_mon_update_completion_actions() {
-	do_test_reload_mon_update_completion_actions(true);
-	do_test_reload_mon_update_completion_actions(false);
+fn test_reload_mon_update_completion_actions_legacy() {
+	do_test_reload_mon_update_completion_actions_legacy(true);
+	do_test_reload_mon_update_completion_actions_legacy(false);
 }
 
 fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

lightning/src/ln/functional_test_utils.rs

@@ -2620,7 +2620,7 @@ macro_rules! expect_htlc_handling_failed_destinations {
 					assert!($expected_failures.contains(&failure_type));
 					num_expected_failures -= 1;
 				},
-				_ => panic!("Unexpected destination"),
+				e => panic!("Expected HTLCHandlingFailed, got {e:?}"),
 			}
 		}
 		assert_eq!(num_expected_failures, 0);
@@ -2644,7 +2644,8 @@ pub fn expect_and_process_pending_htlcs_and_htlc_handling_failed(
 	let events = node.node.get_and_clear_pending_events();
 	expect_htlc_failure_conditions(events, expected_failures);
 	expect_and_process_pending_htlcs(node, false);
-	assert!(node.node.get_and_clear_pending_events().is_empty());
+	let events = node.node.get_and_clear_pending_events();
+	assert!(events.is_empty(), "Unexpected events: {events:?}");
 }
 
 pub fn expect_and_process_pending_htlcs(node: &Node<'_, '_, '_>, process_twice: bool) {

lightning/src/ln/functional_tests.rs

@@ -7964,10 +7964,19 @@ fn do_test_onchain_htlc_settlement_after_close(
 }
 
 #[xtest(feature = "_externalize_tests")]
-pub fn test_onchain_htlc_settlement_after_close() {
+pub fn test_onchain_htlc_settlement_after_close_a() {
 	do_test_onchain_htlc_settlement_after_close(true, true);
+}
+#[xtest(feature = "_externalize_tests")]
+pub fn test_onchain_htlc_settlement_after_close_b() {
 	do_test_onchain_htlc_settlement_after_close(false, true); // Technically redundant, but may as well
+}
+#[xtest(feature = "_externalize_tests")]
+pub fn test_onchain_htlc_settlement_after_close_c() {
 	do_test_onchain_htlc_settlement_after_close(true, false);
+}
+#[xtest(feature = "_externalize_tests")]
+pub fn test_onchain_htlc_settlement_after_close_d() {
 	do_test_onchain_htlc_settlement_after_close(false, false);
 }