Fix payment counts in metrics end-to-end test

The test expected exactly one successful payment after sending the
Lightning payment. However, the successful-payment count also includes the
deposit and channel funding transaction. Depending on timing, the test could
pass because an onchain payment succeeded, or time out because the count
had already exceeded one.

Confirm both onchain payments and wait for their metrics before sending the
Lightning payment. Then require three successful payments with none pending
or failed, and include current metrics in the timeout diagnostic.

AI assistance: OpenAI Codex.

Author: tankyleo

e2e-tests/tests/e2e.rs

@@ -1855,18 +1855,22 @@ async fn test_metrics_endpoint() {
 	assert!(metrics.contains("ldk_server_total_anchor_channels_reserve_sats 0"));
 	assert!(metrics.contains("ldk_server_total_lightning_balance_sats 0"));
 
-	// Set up channel and make a payment to trigger metrics update
+	// Set up the channel and confirm the wallet deposit and channel funding transaction.
 	setup_funded_channel(&bitcoind, &server_a, &server_b, 100_000).await;
+	mine_and_sync(&bitcoind, &[&server_a, &server_b], 6).await;
 
-	// Poll for channel, peer and balance metrics.
+	// Wait for both onchain payments and the channel, peer and balance metrics.
 	let timeout = Duration::from_secs(10);
 	let start = std::time::Instant::now();
 	loop {
 		let metrics = client.get_metrics().await.unwrap();
 		if metrics.contains("ldk_server_total_peers_count 1")
 			&& metrics.contains("ldk_server_total_channels_count 1")
 			&& metrics.contains("ldk_server_total_public_channels_count 1")
-			&& metrics.contains("ldk_server_total_payments_count 2")
+			&& metrics.contains("ldk_server_total_payments_count 2\n")
+			&& metrics.contains("ldk_server_total_successful_payments_count 2\n")
+			&& metrics.contains("ldk_server_total_pending_payments_count 0\n")
+			&& metrics.contains("ldk_server_total_failed_payments_count 0\n")
 			&& !metrics.contains("ldk_server_total_lightning_balance_sats 0")
 			&& !metrics.contains("ldk_server_total_onchain_balance_sats 0")
 			&& !metrics.contains("ldk_server_spendable_onchain_balance_sats 0")
@@ -1887,12 +1891,15 @@ async fn test_metrics_endpoint() {
 
 	send_bolt11_payment(&server_a, &server_b, 10_000_000).await;
 
-	// Wait to receive the PaymentSuccessful event and update metrics
+	// The deposit, channel funding and BOLT11 payment must all be counted as successful.
 	let timeout = Duration::from_secs(30);
 	let start = std::time::Instant::now();
 	loop {
 		let metrics = client.get_metrics().await.unwrap();
-		if metrics.contains("ldk_server_total_successful_payments_count 1")
+		if metrics.contains("ldk_server_total_payments_count 3\n")
+			&& metrics.contains("ldk_server_total_successful_payments_count 3\n")
+			&& metrics.contains("ldk_server_total_pending_payments_count 0\n")
+			&& metrics.contains("ldk_server_total_failed_payments_count 0\n")
 			&& !metrics.contains("ldk_server_total_lightning_balance_sats 0")
 			&& !metrics.contains("ldk_server_total_onchain_balance_sats 0")
 			&& !metrics.contains("ldk_server_spendable_onchain_balance_sats 0")
@@ -1901,7 +1908,7 @@ async fn test_metrics_endpoint() {
 			break;
 		}
 		if start.elapsed() > timeout {
-			panic!("Timed out waiting for payment metrics to update");
+			panic!("Timed out waiting for payment metrics to update. Current metrics:\n{metrics}");
 		}
 		tokio::time::sleep(Duration::from_millis(500)).await;
 	}