Stabilize reorg test setup

Use available listener ports and tolerate intermediate force-close

balances so the property test exercises reorg behavior instead of

setup timing.

Co-Authored-By: HAL 9000

Author: tnull

tests/common/mod.rs

@@ -21,9 +21,9 @@ pub(crate) mod lnd;
 use std::collections::{HashMap, HashSet};
 use std::env;
 use std::future::Future;
+use std::net::TcpListener;
 use std::path::PathBuf;
 use std::str::FromStr;
-use std::sync::atomic::{AtomicU16, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -358,13 +358,14 @@ pub(crate) fn random_storage_path() -> PathBuf {
 	temp_path
 }
 
-static NEXT_PORT: AtomicU16 = AtomicU16::new(20000);
-
 pub(crate) fn generate_listening_addresses() -> Vec<SocketAddress> {
-	let port = NEXT_PORT.fetch_add(2, Ordering::Relaxed);
+	let listener_a = TcpListener::bind(("127.0.0.1", 0)).expect("available listener port");
+	let listener_b = TcpListener::bind(("127.0.0.1", 0)).expect("available listener port");
+	let port_a = listener_a.local_addr().expect("listener address").port();
+	let port_b = listener_b.local_addr().expect("listener address").port();
 	vec![
-		SocketAddress::TcpIpV4 { addr: [127, 0, 0, 1], port },
-		SocketAddress::TcpIpV4 { addr: [127, 0, 0, 1], port: port + 1 },
+		SocketAddress::TcpIpV4 { addr: [127, 0, 0, 1], port: port_a },
+		SocketAddress::TcpIpV4 { addr: [127, 0, 0, 1], port: port_b },
 	]
 }
 

tests/reorg_test.rs

@@ -143,43 +143,56 @@ proptest! {
 			generate_blocks_and_wait(bitcoind, electrs, 1).await;
 			sync_wallets!();
 
-			if force_close {
-				for node in &nodes {
-					node.sync_wallets().unwrap();
-					// If there is no more balance, there is nothing to process here.
-					if node.list_balances().lightning_balances.len() < 1 {
-						return;
-					}
-					match node.list_balances().lightning_balances[0] {
-						LightningBalance::ClaimableAwaitingConfirmations {
-							confirmation_height,
-							..
-						} => {
-							let cur_height = node.status().current_best_block.height;
-							let blocks_to_go = confirmation_height - cur_height;
+				if force_close {
+					let mut found_claimable_balance = false;
+					for node in &nodes {
+						node.sync_wallets().unwrap();
+						let balances = node.list_balances();
+						let confirmation_height = balances.lightning_balances.iter().find_map(|b| {
+							match b {
+								LightningBalance::ClaimableAwaitingConfirmations {
+									confirmation_height,
+									..
+								} => Some(*confirmation_height),
+								_ => None,
+							}
+						});
+						let Some(confirmation_height) = confirmation_height else {
+							continue;
+						};
+						found_claimable_balance = true;
+
+						let cur_height = node.status().current_best_block.height;
+						let blocks_to_go = confirmation_height.saturating_sub(cur_height);
+						if blocks_to_go > 0 {
 							generate_blocks_and_wait(bitcoind, electrs, blocks_to_go as usize).await;
 							node.sync_wallets().unwrap();
-						},
-						_ => panic!("Unexpected balance state for node_hub!"),
-					}
-
-					assert!(node.list_balances().lightning_balances.len() < 2);
-					assert!(node.list_balances().pending_balances_from_channel_closures.len() > 0);
-					match node.list_balances().pending_balances_from_channel_closures[0] {
-						PendingSweepBalance::BroadcastAwaitingConfirmation { .. } => {},
-						_ => panic!("Unexpected balance state!"),
-					}
+						}
 
-					generate_blocks_and_wait(&bitcoind, electrs, 1).await;
-					node.sync_wallets().unwrap();
-					assert!(node.list_balances().lightning_balances.len() < 2);
-					assert!(node.list_balances().pending_balances_from_channel_closures.len() > 0);
-					match node.list_balances().pending_balances_from_channel_closures[0] {
-						PendingSweepBalance::AwaitingThresholdConfirmations { .. } => {},
-						_ => panic!("Unexpected balance state!"),
+						let balances = node.list_balances();
+						assert!(
+							balances.pending_balances_from_channel_closures.iter().any(|b| matches!(
+								b,
+								PendingSweepBalance::BroadcastAwaitingConfirmation { .. }
+									| PendingSweepBalance::AwaitingThresholdConfirmations { .. }
+							)),
+							"Unexpected balance state: {:?}",
+							balances
+						);
+
+						generate_blocks_and_wait(bitcoind, electrs, 1).await;
+						node.sync_wallets().unwrap();
+						let balances = node.list_balances();
+						assert!(
+							balances.pending_balances_from_channel_closures.iter().any(|b| {
+								matches!(b, PendingSweepBalance::AwaitingThresholdConfirmations { .. })
+							}),
+							"Unexpected balance state: {:?}",
+							balances
+						);
 					}
+					assert!(found_claimable_balance);
 				}
-			}
 
 			generate_blocks_and_wait(bitcoind, electrs, 6).await;
 			sync_wallets!();