test both with closed chan and not-closed chan

Author: TheBlueMatt

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -3402,8 +3402,7 @@ fn test_durable_preimages_on_closed_channel() {
 	do_test_durable_preimages_on_closed_channel(false, false, false);
 }
 
-#[test]
-fn test_reload_mon_update_completion_actions() {
+fn do_test_reload_mon_update_completion_actions(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);
@@ -3462,12 +3461,32 @@ fn test_reload_mon_update_completion_actions() {
 	let manager_b = nodes[1].node.encode();
 	reload_node!(nodes[1], &manager_b, &[&mon_ab, &mon_bc], persister, new_chain_monitor, nodes_1_deserialized);
 
+	if close_during_reload {
+		// Test that we still free the B<->C channel if the A<->B channel closed while we reloaded
+		// (as learned about during the on-reload block connection).
+		nodes[0].node.force_close_broadcasting_latest_txn(&chan_id_ab, &nodes[1].node.get_our_node_id()).unwrap();
+		check_added_monitors!(nodes[0], 1);
+		check_closed_broadcast!(nodes[0], true);
+		check_closed_event(&nodes[0], 1, ClosureReason::HolderForceClosed, false);
+		let as_closing_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
+		mine_transaction_without_checks(&nodes[1], &as_closing_tx[0]);
+	}
+
 	let bc_update_id = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_bc).unwrap().2;
-	expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
+	let mut events = nodes[1].node.get_and_clear_pending_events();
+	assert_eq!(events.len(), if close_during_reload { 2 } else { 1 });
+	expect_payment_forwarded(events.pop().unwrap(), &nodes[1], &nodes[0], &nodes[2], Some(1000), close_during_reload, false);
+	if close_during_reload {
+		match events[0] {
+			Event::ChannelClosed { .. } => {},
+			_ => panic!(),
+		}
+		check_closed_broadcast!(nodes[1], true);
+	}
 
 	// Once we run event processing the monitor should free, check that it was indeed the B<->C
 	// channel which was updated.
-	check_added_monitors(&nodes[1], 1);
+	check_added_monitors(&nodes[1], if close_during_reload { 2 } else { 1 });
 	let post_ev_bc_update_id = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_bc).unwrap().2;
 	assert!(bc_update_id != post_ev_bc_update_id);
 
@@ -3477,3 +3496,9 @@ fn test_reload_mon_update_completion_actions() {
 	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 	send_payment(&nodes[1], &[&nodes[2]], 100_000);
 }
+
+#[test]
+fn test_reload_mon_update_completion_actions() {
+	do_test_reload_mon_update_completion_actions(true);
+	do_test_reload_mon_update_completion_actions(false);
+}