From: Matt Corallo <git@bluematt.me>
Date: Thu, 18 Mar 2021 17:16:58 +0000 (-0400)
Subject: [functional tests] Drop unused disconnect_block utility
X-Git-Tag: v0.0.14~44^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4ebfa1d7ac554dfefe973ffc47ad993f6398f61b;p=rust-lightning

[functional tests] Drop unused disconnect_block utility

This also reduces some needless clones and indirections.
---

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index fe3df8d1..e7f61c6a 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -107,16 +107,12 @@ pub fn connect_block<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, block: &Block)
 	node.blocks.borrow_mut().push((block.header, height));
 }
 
-pub fn disconnect_block<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, header: &BlockHeader) {
-	node.chain_monitor.chain_monitor.block_disconnected(header, node.best_block_info().1);
-	node.node.block_disconnected(header);
-	node.blocks.borrow_mut().pop();
-}
 pub fn disconnect_blocks<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, count: u32) {
-	assert!(node.blocks.borrow_mut().len() as u32 > count); // Cannot disconnect genesis
 	for _ in 0..count {
-		let block_header = node.blocks.borrow().last().unwrap().0;
-		disconnect_block(&node, &block_header);
+		let orig_header = node.blocks.borrow_mut().pop().unwrap();
+		assert!(orig_header.1 > 0); // Cannot disconnect genesis
+		node.chain_monitor.chain_monitor.block_disconnected(&orig_header.0, orig_header.1);
+		node.node.block_disconnected(&orig_header.0);
 	}
 }