f check that we dont fail until we're suposed to

Author: TheBlueMatt

lightning/src/ln/functional_tests.rs

@@ -3712,11 +3712,17 @@ fn do_test_holding_cell_htlc_add_timeouts(forwarded_htlc: bool) {
 
 	let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 	nodes[1].block_notifier.block_connected_checked(&header, 101, &[], &[]);
-	for i in 102..TEST_FINAL_CLTV + 100 + 1 - CLTV_CLAIM_BUFFER - LATENCY_GRACE_PERIOD_BLOCKS {
+	for i in 102..TEST_FINAL_CLTV + 100 - CLTV_CLAIM_BUFFER - LATENCY_GRACE_PERIOD_BLOCKS {
 		header.prev_blockhash = header.bitcoin_hash();
 		nodes[1].block_notifier.block_connected_checked(&header, i, &[], &[]);
 	}
 
+	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
+	assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
+
+	header.prev_blockhash = header.bitcoin_hash();
+	nodes[1].block_notifier.block_connected_checked(&header, TEST_FINAL_CLTV + 100 - CLTV_CLAIM_BUFFER - LATENCY_GRACE_PERIOD_BLOCKS, &[], &[]);
+
 	if forwarded_htlc {
 		expect_pending_htlcs_forwardable!(nodes[1]);
 		check_added_monitors!(nodes[1], 1);