f cheat and resolve val's suggestion by expanding existing test some

Author: TheBlueMatt

lightning/src/ln/reorg_tests.rs

@@ -189,7 +189,7 @@ fn test_onchain_htlc_timeout_delay_remote_commitment() {
 	do_test_onchain_htlc_reorg(false, false);
 }
 
-fn do_test_unconf_chan(reload_node: bool) {
+fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool) {
 	// After creating a chan between nodes, we disconnect all blocks previously seen to force a
 	// channel close on nodes[0] side. We also use this to provide very basic testing of logic
 	// around freeing background events which store monitor updates during block_[dis]connected.
@@ -214,14 +214,16 @@ fn do_test_unconf_chan(reload_node: bool) {
 		header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 		headers.push(header.clone());
 	}
-	while !headers.is_empty() {
-		nodes[0].node.block_disconnected(&headers.pop().unwrap());
-	}
-	check_closed_broadcast!(nodes[0], false);
-	{
-		let channel_state = nodes[0].node.channel_state.lock().unwrap();
-		assert_eq!(channel_state.by_id.len(), 0);
-		assert_eq!(channel_state.short_to_id.len(), 0);
+	if !reorg_after_reload {
+		while !headers.is_empty() {
+			nodes[0].node.block_disconnected(&headers.pop().unwrap());
+		}
+		check_closed_broadcast!(nodes[0], false);
+		{
+			let channel_state = nodes[0].node.channel_state.lock().unwrap();
+			assert_eq!(channel_state.by_id.len(), 0);
+			assert_eq!(channel_state.short_to_id.len(), 0);
+		}
 	}
 
 	if reload_node {
@@ -264,14 +266,28 @@ fn do_test_unconf_chan(reload_node: bool) {
 		check_added_monitors!(nodes[0], 1);
 	}
 
+	if reorg_after_reload {
+		while !headers.is_empty() {
+			nodes[0].node.block_disconnected(&headers.pop().unwrap());
+		}
+		check_closed_broadcast!(nodes[0], false);
+		{
+			let channel_state = nodes[0].node.channel_state.lock().unwrap();
+			assert_eq!(channel_state.by_id.len(), 0);
+			assert_eq!(channel_state.short_to_id.len(), 0);
+		}
+	}
+
 	nodes[0].node.test_process_background_events(); // Required to free the pending background monitor update
 	check_added_monitors!(nodes[0], 1);
 }
 
 #[test]
 fn test_unconf_chan() {
-	do_test_unconf_chan(true);
-	do_test_unconf_chan(false);
+	do_test_unconf_chan(true, true);
+	do_test_unconf_chan(false, true);
+	do_test_unconf_chan(true, false);
+	do_test_unconf_chan(false, false);
 }
 
 #[test]