nit: Refactor node setup in tests to use new_node function for improved clarity

Author: moisesPompilio

tests/common/mod.rs

@@ -301,6 +301,11 @@ pub(crate) fn setup_two_nodes(
 	(node_a, node_b)
 }
 
+pub(crate) fn new_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
+	let config = random_config(anchor_channels);
+	setup_node(chain_source, config, None)
+}
+
 pub(crate) fn setup_node(
 	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
 ) -> TestNode {

tests/integration_tests_rust.rs

@@ -20,10 +20,10 @@ use common::{
 	bump_fee_and_broadcast, distribute_funds_unconfirmed, do_channel_full_cycle,
 	expect_channel_pending_event, expect_channel_ready_event, expect_event,
 	expect_payment_claimable_event, expect_payment_received_event, expect_payment_successful_event,
-	generate_blocks_and_wait, open_channel, open_channel_push_amt, premine_and_distribute_funds,
-	premine_blocks, prepare_rbf, random_config, random_listening_addresses,
-	setup_bitcoind_and_electrsd, setup_builder, setup_node, setup_node_for_async_payments,
-	setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
+	generate_blocks_and_wait, new_node, open_channel, open_channel_push_amt,
+	premine_and_distribute_funds, premine_blocks, prepare_rbf, random_config,
+	random_listening_addresses, setup_bitcoind_and_electrsd, setup_builder, setup_node,
+	setup_node_for_async_payments, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
 };
 use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
 use ldk_node::liquidity::LSPS2ServiceConfig;
@@ -687,18 +687,11 @@ fn run_rbf_test(is_insert_block: bool) {
 	let chain_source_electrsd = TestChainSource::Electrum(&electrsd);
 	let chain_source_esplora = TestChainSource::Esplora(&electrsd);
 
-	macro_rules! config_node {
-		($chain_source: expr, $anchor_channels: expr) => {{
-			let config_a = random_config($anchor_channels);
-			let node = setup_node(&$chain_source, config_a, None);
-			node
-		}};
-	}
 	let anchor_channels = false;
 	let nodes = vec![
-		config_node!(chain_source_electrsd, anchor_channels),
-		config_node!(chain_source_bitcoind, anchor_channels),
-		config_node!(chain_source_esplora, anchor_channels),
+		new_node(&chain_source_bitcoind, anchor_channels),
+		new_node(&chain_source_electrsd, anchor_channels),
+		new_node(&chain_source_esplora, anchor_channels),
 	];
 
 	let (bitcoind, electrs) = (&bitcoind.client, &electrsd.client);

tests/reorg_test.rs

@@ -8,9 +8,9 @@ use proptest::prelude::prop;
 use proptest::proptest;
 
 use crate::common::{
-	expect_event, generate_blocks_and_wait, invalidate_blocks, open_channel,
-	premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd, setup_node,
-	wait_for_outpoint_spend, TestChainSource,
+	expect_event, generate_blocks_and_wait, invalidate_blocks, new_node, open_channel,
+	premine_and_distribute_funds, setup_bitcoind_and_electrsd, wait_for_outpoint_spend,
+	TestChainSource,
 };
 
 proptest! {
@@ -23,18 +23,11 @@ proptest! {
 		let chain_source_electrsd = TestChainSource::Electrum(&electrsd);
 		let chain_source_esplora = TestChainSource::Esplora(&electrsd);
 
-		macro_rules! config_node {
-			($chain_source: expr, $anchor_channels: expr) => {{
-				let config_a = random_config($anchor_channels);
-				let node = setup_node(&$chain_source, config_a, None);
-				node
-			}};
-		}
 		let anchor_channels = true;
 		let nodes = vec![
-			config_node!(chain_source_electrsd, anchor_channels),
-			config_node!(chain_source_bitcoind, anchor_channels),
-			config_node!(chain_source_esplora, anchor_channels),
+			new_node(&chain_source_electrsd, anchor_channels),
+			new_node(&chain_source_bitcoind, anchor_channels),
+			new_node(&chain_source_esplora, anchor_channels),
 		];
 
 		let (bitcoind, electrs) = (&bitcoind.client, &electrsd.client);