f use check_added_monitors and start from tx conf height of 1 with explainer

Author: dunxen

lightning/src/ln/functional_tests.rs

@@ -9156,43 +9156,38 @@ fn test_coinbase_funding_tx() {
 	nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &accept_channel);
 
 	// Create the coinbase funding transaction.
-	let (temporary_channel_id, tx, funding_output) = create_coinbase_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 42);
+	let (temporary_channel_id, tx, _) = create_coinbase_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 42);
 
 	nodes[0].node.funding_transaction_generated(&temporary_channel_id, &nodes[1].node.get_our_node_id(), tx.clone()).unwrap();
 	check_added_monitors!(nodes[0], 0);
 	let funding_created = get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, nodes[1].node.get_our_node_id());
 
 	nodes[1].node.handle_funding_created(&nodes[0].node.get_our_node_id(), &funding_created);
-	{
-		let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
-		assert_eq!(added_monitors.len(), 1);
-		assert_eq!(added_monitors[0].0, funding_output);
-		added_monitors.clear();
-	}
+	check_added_monitors!(nodes[1], 1);
 	expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
 
 	let funding_signed = get_event_msg!(nodes[1], MessageSendEvent::SendFundingSigned, nodes[0].node.get_our_node_id());
 
 	nodes[0].node.handle_funding_signed(&nodes[1].node.get_our_node_id(), &funding_signed);
-	{
-		let mut added_monitors = nodes[0].chain_monitor.added_monitors.lock().unwrap();
-		assert_eq!(added_monitors.len(), 1);
-		assert_eq!(added_monitors[0].0, funding_output);
-		added_monitors.clear();
-	}
+	check_added_monitors!(nodes[0], 1);
 
 	expect_channel_pending_event(&nodes[0], &nodes[1].node.get_our_node_id());
 	assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 
-	confirm_transaction_at(&nodes[0], &tx, 2);
+	// Starting at height 0, we "confirm" the coinbase at height 1.
+	confirm_transaction_at(&nodes[0], &tx, 1);
+	// We connect 98 more blocks to have 99 confirmations for the coinbase transaction.
 	connect_blocks(&nodes[0], COINBASE_MATURITY - 2);
-	assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
+	// Check that we have no pending message events (we have not queued a `channel_ready` yet).
+	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
+	// Now connect one more block which results in 100 confirmations of the coinbase transaction.
 	connect_blocks(&nodes[0], 1);
+	// There should now be a `channel_ready` which can be handled.
 	let _ = &nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &get_event_msg!(&nodes[0], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id()));
 
-	confirm_transaction_at(&nodes[1], &tx, 2);
+	confirm_transaction_at(&nodes[1], &tx, 1);
 	connect_blocks(&nodes[1], COINBASE_MATURITY - 2);
-	assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
+	assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 	connect_blocks(&nodes[1], 1);
 	expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
 	create_chan_between_nodes_with_value_confirm_second(&nodes[0], &nodes[1]);