Skip to content

Commit 185b8a4

Browse files
committed
Fix silent rebase conflict in reorg_tests.rs
Commit d7726ef 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.
1 parent 7e4598d commit 185b8a4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lightning/src/ln/reorg_tests.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,8 @@ fn do_test_split_htlc_expiry_tracking(use_third_htlc: bool, reorg_out: bool) {
971971
nodes[1].node.force_close_broadcasting_latest_txn(&chan_id, &node_a_id, err).unwrap();
972972
check_closed_broadcast(&nodes[1], 1, true);
973973
check_added_monitors(&nodes[1], 1);
974-
let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true) };
974+
let message = "Channel force-closed".to_owned();
975+
let reason = ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(true), message };
975976
check_closed_event(&nodes[1], 1, reason, false, &[node_a_id], 10_000_000);
976977

977978
let mut txn = nodes[1].tx_broadcaster.txn_broadcast();

0 commit comments

Comments
 (0)