f 1/2 of test_unconf_chan fixed

Author: valentinewallace

lightning/src/ln/functional_test_utils.rs

@@ -113,13 +113,29 @@ pub fn connect_block<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, block: &Block,
 	node.node.block_connected(&block.header, &txdata, height);
 	node.node.test_process_background_events();
 	*node.last_block.lock().unwrap() = (block.header.block_hash(), height);
+	node.blocks.lock().unwrap().push((block.header, height));
 }
 
 pub fn disconnect_block<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, header: &BlockHeader, height: u32) {
 	node.chain_monitor.chain_monitor.block_disconnected(header, height);
 	node.node.block_disconnected(header);
 	node.node.test_process_background_events();
 	*node.last_block.lock().unwrap() = (header.prev_blockhash, height - 1);
+	node.blocks.lock().unwrap().pop();
+}
+
+pub fn disconnect_all_blocks<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>) {
+	let mut blocks_len = {
+		node.blocks.lock().unwrap().len()
+	};
+	while blocks_len > 0 {
+		let (block_header, height) = {
+			let blocks = node.blocks.lock().unwrap();
+			(blocks[blocks.len() - 1].0, blocks[blocks.len() - 1].1)
+		};
+		disconnect_block(&node, &block_header, height);
+		blocks_len = node.blocks.lock().unwrap().len();
+	}
 }
 
 pub struct TestChanMonCfg {
@@ -153,6 +169,7 @@ pub struct Node<'a, 'b: 'a, 'c: 'b> {
 	pub network_chan_count: Rc<RefCell<u32>>,
 	pub logger: &'c test_utils::TestLogger,
 	pub last_block: Mutex<(BlockHash, u32)>,
+	pub blocks: Mutex<Vec<(BlockHeader, u32)>>,
 }
 
 impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
@@ -1221,6 +1238,7 @@ pub fn create_network<'a, 'b: 'a, 'c: 'b>(node_count: usize, cfgs: &'b Vec<NodeC
 		                 node_seed: cfgs[i].node_seed, network_chan_count: chan_count.clone(),
 		                 network_payment_count: payment_count.clone(), logger: cfgs[i].logger,
 		                 last_block: Mutex::new((genesis_block(Network::Testnet).header.block_hash(), 0)),
+		                 blocks: Mutex::new(Vec::new())
 		})
 	}
 

lightning/src/ln/reorg_tests.rs

@@ -209,17 +209,8 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool) {
 	assert_eq!(channel_state.short_to_id.len(), 1);
 	mem::drop(channel_state);
 
-	let mut headers = Vec::new();
-	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: genesis_block(Network::Testnet).header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
-	headers.push(header.clone());
-	for _i in 2..100 {
-		header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
-		headers.push(header.clone());
-	}
 	if !reorg_after_reload {
-		while !headers.is_empty() {
-			nodes[0].node.block_disconnected(&headers.pop().unwrap());
-		}
+		disconnect_all_blocks(&nodes[0]);
 		check_closed_broadcast!(nodes[0], false);
 		{
 			let channel_state = nodes[0].node.channel_state.lock().unwrap();
@@ -271,9 +262,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool) {
 	}
 
 	if reorg_after_reload {
-		while !headers.is_empty() {
-			nodes[0].node.block_disconnected(&headers.pop().unwrap());
-		}
+		disconnect_all_blocks(&nodes[0]);
 		check_closed_broadcast!(nodes[0], false);
 		{
 			let channel_state = nodes[0].node.channel_state.lock().unwrap();