Make announcing channels in tests a choice again

Previously, we always opened announced channels in tests, but it should
be a deliberate choice depending on the scenario we're trying to test
for.

Author: tnull

tests/common/mod.rs

@@ -203,16 +203,11 @@ pub(crate) fn random_listening_addresses() -> Vec<SocketAddress> {
 
 pub(crate) fn random_node_alias() -> Option<NodeAlias> {
 	let mut rng = thread_rng();
-	let ranged_val = rng.gen_range(0..10);
-	match ranged_val {
-		0 => None,
-		val => {
-			let alias = format!("ldk-node-{}", val);
-			let mut bytes = [0u8; 32];
-			bytes[..alias.as_bytes().len()].copy_from_slice(alias.as_bytes());
-			Some(NodeAlias(bytes))
-		},
-	}
+	let rand_val = rng.gen_range(0..1000);
+	let alias = format!("ldk-node-{}", rand_val);
+	let mut bytes = [0u8; 32];
+	bytes[..alias.as_bytes().len()].copy_from_slice(alias.as_bytes());
+	Some(NodeAlias(bytes))
 }
 
 pub(crate) fn random_config(anchor_channels: bool) -> Config {
@@ -404,17 +399,30 @@ pub(crate) fn premine_and_distribute_funds<E: ElectrumApi>(
 }
 
 pub fn open_channel(
-	node_a: &TestNode, node_b: &TestNode, funding_amount_sat: u64, electrsd: &ElectrsD,
+	node_a: &TestNode, node_b: &TestNode, funding_amount_sat: u64, should_announce: bool,
+	electrsd: &ElectrsD,
 ) {
-	node_a
-		.open_announced_channel(
-			node_b.node_id(),
-			node_b.listening_addresses().unwrap().first().unwrap().clone(),
-			funding_amount_sat,
-			None,
-			None,
-		)
-		.unwrap();
+	if should_announce {
+		node_a
+			.open_announced_channel(
+				node_b.node_id(),
+				node_b.listening_addresses().unwrap().first().unwrap().clone(),
+				funding_amount_sat,
+				None,
+				None,
+			)
+			.unwrap();
+	} else {
+		node_a
+			.open_channel(
+				node_b.node_id(),
+				node_b.listening_addresses().unwrap().first().unwrap().clone(),
+				funding_amount_sat,
+				None,
+				None,
+			)
+			.unwrap();
+	}
 	assert!(node_a.list_peers().iter().find(|c| { c.node_id == node_b.node_id() }).is_some());
 
 	let funding_txo_a = expect_channel_pending_event!(node_a, node_b.node_id());
@@ -451,7 +459,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 	let funding_amount_sat = 2_080_000;
 	let push_msat = (funding_amount_sat / 2) * 1000; // balance the channel
 	node_a
-		.open_channel(
+		.open_announced_channel(
 			node_b.node_id(),
 			node_b.listening_addresses().unwrap().first().unwrap().clone(),
 			funding_amount_sat,

tests/integration_tests_rust.rs

@@ -131,16 +131,16 @@ fn multi_hop_sending() {
 	//                   \                  /
 	//                    (1M:0)- N3 -(1M:0)
 
-	open_channel(&nodes[0], &nodes[1], 100_000, &electrsd);
-	open_channel(&nodes[1], &nodes[2], 1_000_000, &electrsd);
+	open_channel(&nodes[0], &nodes[1], 100_000, true, &electrsd);
+	open_channel(&nodes[1], &nodes[2], 1_000_000, true, &electrsd);
 	// We need to sync wallets in-between back-to-back channel opens from the same node so BDK
 	// wallet picks up on the broadcast funding tx and doesn't double-spend itself.
 	//
 	// TODO: Remove once fixed in BDK.
 	nodes[1].sync_wallets().unwrap();
-	open_channel(&nodes[1], &nodes[3], 1_000_000, &electrsd);
-	open_channel(&nodes[2], &nodes[4], 1_000_000, &electrsd);
-	open_channel(&nodes[3], &nodes[4], 1_000_000, &electrsd);
+	open_channel(&nodes[1], &nodes[3], 1_000_000, true, &electrsd);
+	open_channel(&nodes[2], &nodes[4], 1_000_000, true, &electrsd);
+	open_channel(&nodes[3], &nodes[4], 1_000_000, true, &electrsd);
 
 	generate_blocks_and_wait(&bitcoind.client, &electrsd.client, 6);
 
@@ -418,7 +418,7 @@ fn simple_bolt12_send_receive() {
 	);
 
 	node_a.sync_wallets().unwrap();
-	open_channel(&node_a, &node_b, 4_000_000, &electrsd);
+	open_channel(&node_a, &node_b, 4_000_000, true, &electrsd);
 
 	generate_blocks_and_wait(&bitcoind.client, &electrsd.client, 6);
 
@@ -625,7 +625,7 @@ fn generate_bip21_uri() {
 	);
 
 	node_a.sync_wallets().unwrap();
-	open_channel(&node_a, &node_b, 4_000_000, &electrsd);
+	open_channel(&node_a, &node_b, 4_000_000, true, &electrsd);
 	generate_blocks_and_wait(&bitcoind.client, &electrsd.client, 6);
 
 	node_a.sync_wallets().unwrap();
@@ -666,7 +666,7 @@ fn unified_qr_send_receive() {
 	);
 
 	node_a.sync_wallets().unwrap();
-	open_channel(&node_a, &node_b, 4_000_000, &electrsd);
+	open_channel(&node_a, &node_b, 4_000_000, true, &electrsd);
 	generate_blocks_and_wait(&bitcoind.client, &electrsd.client, 6);
 
 	node_a.sync_wallets().unwrap();