From 185b8a4e8c8e911c7e1561ab80a4205616641fdf Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Tue, 15 Jul 2025 10:30:41 +0200 Subject: [PATCH] Fix silent rebase conflict in `reorg_tests.rs` Commit d7726eff0d9739d7e30461767f8fe07458defd53 introduced a test using a `ClosureReason::HolderForceClosed` variant absent of the recently-introduced `message` field, resulting in failing tests on `main`. Here, we fix this silent conflict. --- lightning/src/ln/reorg_tests.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lightning/src/ln/reorg_tests.rs b/lightning/src/ln/reorg_tests.rs index a2de1c5c603..a472cea7ed2 100644 --- a/lightning/src/ln/reorg_tests.rs +++ b/lightning/src/ln/reorg_tests.rs @@ -971,7 +971,8 @@ fn do_test_split_htlc_expiry_tracking(use_third_htlc: bool, reorg_out: bool) { nodes[1].node.force_close_broadcasting_latest_txn(&chan_id, &node_a_id, err).unwrap(); check_closed_broadcast(&nodes[1], 1, true); check_added_monitors(&nodes[1], 1); - let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true) }; + let message = "Channel force-closed".to_owned(); + let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true), message }; check_closed_event(&nodes[1], 1, reason, false, &[node_a_id], 10_000_000); let mut txn = nodes[1].tx_broadcaster.txn_broadcast();