f use time, not heights, for expiry in tests, including changing blocks connected in tests to have incrementing time

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3706,10 +3706,6 @@ where
 					});
 					!htlcs.is_empty() // Only retain this entry if htlcs has at least one entry.
 				});
-				let mut payment_secrets = self.pending_inbound_payments.lock().unwrap();
-				payment_secrets.retain(|_, inbound_payment| {
-					inbound_payment.expiry_height > height
-				});
 			}
 		}
 

lightning/src/ln/functional_test_utils.rs

@@ -66,7 +66,7 @@ pub fn confirm_transaction_at<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, tx: &T
 		connect_blocks(node, conf_height - first_connect_height);
 	}
 	let mut block = Block {
-		header: BlockHeader { version: 0x20000000, prev_blockhash: node.best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 },
+		header: BlockHeader { version: 0x20000000, prev_blockhash: node.best_block_hash(), merkle_root: Default::default(), time: conf_height, bits: 42, nonce: 42 },
 		txdata: Vec::new(),
 	};
 	for _ in 0..*node.network_chan_count.borrow() { // Make sure we don't end up with channels at the same short id by offsetting by chan_count
@@ -102,15 +102,16 @@ pub fn connect_blocks<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, depth: u32) ->
 		_ => false,
 	};
 
+	let height = node.best_block_info().1 + 1;
 	let mut block = Block {
-		header: BlockHeader { version: 0x2000000, prev_blockhash: node.best_block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 },
+		header: BlockHeader { version: 0x2000000, prev_blockhash: node.best_block_hash(), merkle_root: Default::default(), time: height, bits: 42, nonce: 42 },
 		txdata: vec![],
 	};
 	assert!(depth >= 1);
-	for _ in 0..depth - 1 {
+	for i in 1..depth {
 		do_connect_block(node, &block, skip_intermediaries);
 		block = Block {
-			header: BlockHeader { version: 0x20000000, prev_blockhash: block.header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 },
+			header: BlockHeader { version: 0x20000000, prev_blockhash: block.header.block_hash(), merkle_root: Default::default(), time: height + i, bits: 42, nonce: 42 },
 			txdata: vec![],
 		};
 	}

lightning/src/ln/functional_tests.rs

@@ -8138,7 +8138,7 @@ fn test_preimage_storage() {
 	create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).0.contents.short_channel_id;
 
 	{
-		let (payment_hash, payment_secret) = nodes[1].node.create_inbound_payment(Some(100_000), 1008, 42);
+		let (payment_hash, payment_secret) = nodes[1].node.create_inbound_payment(Some(100_000), 7200, 42);
 
 		let logger = test_utils::TestLogger::new();
 		let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
@@ -8176,19 +8176,29 @@ fn test_secret_timeout() {
 
 	let (payment_hash, payment_secret_1) = nodes[1].node.create_inbound_payment(Some(100_000), 2, 0);
 
-	// We should fail to register the same payment hash twice, at least until we've connected two
-	// blocks.
+	// We should fail to register the same payment hash twice, at least until we've connected a
+	// block with time 7200 + CHAN_CONFIRM_DEPTH + 2.
 	if let Err(APIError::APIMisuseError { err }) = nodes[1].node.create_inbound_payment_for_hash(payment_hash, Some(100_000), 2, 0) {
 		assert_eq!(err, "Duplicate payment hash");
 	} else { panic!(); }
-	connect_blocks(&nodes[1], 1);
+	let mut block = Block {
+		header: BlockHeader {
+			version: 0x2000000,
+			prev_blockhash: nodes[1].blocks.borrow().last().unwrap().0.block_hash(),
+			merkle_root: Default::default(),
+			time: nodes[1].blocks.borrow().len() as u32 + 7200 + 1, bits: 42, nonce: 42 },
+		txdata: vec![],
+	};
+	connect_block(&nodes[1], &block);
 	if let Err(APIError::APIMisuseError { err }) = nodes[1].node.create_inbound_payment_for_hash(payment_hash, Some(100_000), 2, 0) {
 		assert_eq!(err, "Duplicate payment hash");
 	} else { panic!(); }
 
 	// If we then connect the second block, we should be able to register the same payment hash
 	// again with a different user_payment_id (this time getting a new payment secret).
-	connect_blocks(&nodes[1], 1);
+	block.header.prev_blockhash = block.header.block_hash();
+	block.header.time += 1;
+	connect_block(&nodes[1], &block);
 	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(payment_hash, Some(100_000), 2, 42).unwrap();
 	assert_ne!(payment_secret_1, our_payment_secret);