Update functional test block connection to detect block replays

diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 26fed9e..c586101 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -316,11 +316,25 @@ fn do_connect_block_with_consistency_checks<'a, 'b, 'c, 'd>(
 fn do_connect_block_without_consistency_checks<'a, 'b, 'c, 'd>(
 	node: &'a Node<'b, 'c, 'd>, block: Block, skip_intermediaries: bool,
 ) {
-	let height = node.best_block_info().1 + 1;
 	eprintln!("Connecting block using Block Connection Style: {:?}", *node.connect_style.borrow());
-	// Update the block internally before handing it over to LDK, to ensure our assertions regarding
-	// transaction broadcast are correct.
-	node.blocks.lock().unwrap().push((block.clone(), height));
+	let (new_block, height) = {
+		let mut blocks = node.blocks.lock().unwrap();
+		let existing =
+			blocks.iter().rev().find(|(candidate, _)| candidate == &block).map(|(_, h)| *h);
+		if let Some(height) = existing {
+			// We're being handed a block we've already connected, i.e. this is a redundant rescan
+			// rather than a new block. Reuse the height it was originally connected at rather than
+			// extending the chain.
+			(false, height)
+		} else {
+			let height = blocks.last().unwrap().1 + 1;
+			// Update the block internally before handing it over to LDK, to ensure our assertions
+			// regarding transaction broadcast are correct.
+			blocks.push((block.clone(), height));
+			(true, height)
+		}
+	};
+
 	if !skip_intermediaries {
 		let txdata: Vec<_> = block.txdata.iter().enumerate().collect();
 		match *node.connect_style.borrow() {
@@ -393,14 +407,16 @@ fn do_connect_block_without_consistency_checks<'a, 'b, 'c, 'd>(
 		}
 	}
 
-	for tx in &block.txdata {
-		for input in &tx.input {
-			node.wallet_source.remove_utxo(input.previous_output);
-		}
-		let wallet_script = node.wallet_source.get_change_script().unwrap();
-		for (idx, output) in tx.output.iter().enumerate() {
-			if output.script_pubkey == wallet_script {
-				node.wallet_source.add_utxo(tx.clone(), idx as u32);
+	if new_block {
+		for tx in &block.txdata {
+			for input in &tx.input {
+				node.wallet_source.remove_utxo(input.previous_output);
+			}
+			let wallet_script = node.wallet_source.get_change_script().unwrap();
+			for (idx, output) in tx.output.iter().enumerate() {
+				if output.script_pubkey == wallet_script {
+					node.wallet_source.add_utxo(tx.clone(), idx as u32);
+				}
 			}
 		}
 	}
diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
index 1f5bd39..c3a4ce3 100644
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@ -2362,16 +2362,6 @@ pub fn test_htlc_ignore_latest_remote_commitment() {
 	let node_a_id = nodes[0].node.get_our_node_id();
 	let node_b_id = nodes[1].node.get_our_node_id();
 
-	match *nodes[1].connect_style.borrow() {
-		ConnectStyle::FullBlockViaListen
-		| ConnectStyle::FullBlockDisconnectionsSkippingViaListen => {
-			// We rely on the ability to connect a block redundantly, which isn't allowed via
-			// `chain::Listen`, so we never run the test if we randomly get assigned that
-			// connect_style.
-			return;
-		},
-		_ => {},
-	}
 	let funding_tx = create_announced_chan_between_nodes(&nodes, 0, 1).3;
 	let message = "Channel force-closed".to_owned();
 	route_payment(&nodes[0], &[&nodes[1]], 10000000);
diff --git a/lightning/src/ln/monitor_tests.rs b/lightning/src/ln/monitor_tests.rs
index f52f093..ff50724 100644
--- a/lightning/src/ln/monitor_tests.rs
+++ b/lightning/src/ln/monitor_tests.rs
@@ -2859,17 +2859,19 @@ fn do_test_anchors_aggregated_revoked_htlc_tx(p2a_anchor: bool) {
 	let mut events = nodes[1].chain_monitor.chain_monitor.get_and_clear_pending_events();
 	// Certain block `ConnectStyle`s cause an extra `ChannelClose` event to be emitted since the
 	// best block is updated before the confirmed transactions are notified.
-	match *nodes[1].connect_style.borrow() {
-		ConnectStyle::BestBlockFirst|ConnectStyle::BestBlockFirstReorgsOnlyTip|ConnectStyle::BestBlockFirstSkippingBlocks => {
-			assert_eq!(events.len(), 4);
-			if let Event::BumpTransaction(BumpTransactionEvent::ChannelClose { .. }) = events.remove(0) {}
-			else { panic!("unexpected event"); }
-			if let Event::BumpTransaction(BumpTransactionEvent::ChannelClose { .. }) = events.remove(1) {}
-			else { panic!("unexpected event"); }
-
-		},
-		_ => assert_eq!(events.len(), 2),
-	};
+	if nodes[1].connect_style.borrow().updates_best_block_first() {
+		assert_eq!(events.len(), 4);
+		if let Event::BumpTransaction(BumpTransactionEvent::ChannelClose { .. }) = events.remove(0) {
+		} else {
+			panic!("unexpected event");
+		}
+		if let Event::BumpTransaction(BumpTransactionEvent::ChannelClose { .. }) = events.remove(1) {
+		} else {
+			panic!("unexpected event");
+		}
+	} else {
+		assert_eq!(events.len(), 2);
+	}
 	let htlc_tx = {
 		let secret_key = SecretKey::from_slice(&[1; 32]).unwrap();
 		let public_key = PublicKey::new(secret_key.public_key(&secp));