Move async_payment_role to TestConfig

It's weird to have a special intermediary `setup_node` method if we have
`TestConfig` for exactly that reason by now. So we move
`async_payment_role` over.

Author: tnull

tests/common/mod.rs

@@ -292,6 +292,7 @@ pub(crate) struct TestConfig {
 	pub log_writer: TestLogWriter,
 	pub store_type: TestStoreType,
 	pub node_entropy: NodeEntropy,
+	pub async_payments_role: Option<AsyncPaymentsRole>,
 }
 
 impl Default for TestConfig {
@@ -302,7 +303,8 @@ impl Default for TestConfig {
 
 		let mnemonic = generate_entropy_mnemonic(None);
 		let node_entropy = NodeEntropy::from_bip39_mnemonic(mnemonic, None);
-		TestConfig { node_config, log_writer, store_type, node_entropy }
+		let async_payments_role = None;
+		TestConfig { node_config, log_writer, store_type, node_entropy, async_payments_role }
 	}
 }
 
@@ -359,13 +361,6 @@ pub(crate) fn setup_two_nodes_with_store(
 }
 
 pub(crate) fn setup_node(chain_source: &TestChainSource, config: TestConfig) -> TestNode {
-	setup_node_for_async_payments(chain_source, config, None)
-}
-
-pub(crate) fn setup_node_for_async_payments(
-	chain_source: &TestChainSource, config: TestConfig,
-	async_payments_role: Option<AsyncPaymentsRole>,
-) -> TestNode {
 	setup_builder!(builder, config.node_config);
 	match chain_source {
 		TestChainSource::Esplora(electrsd) => {
@@ -419,7 +414,7 @@ pub(crate) fn setup_node_for_async_payments(
 		},
 	}
 
-	builder.set_async_payments_role(async_payments_role).unwrap();
+	builder.set_async_payments_role(config.async_payments_role).unwrap();
 
 	let node = match config.store_type {
 		TestStoreType::TestSyncStore => {

tests/integration_tests_rust.rs

@@ -23,8 +23,7 @@ use common::{
 	expect_splice_pending_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, TestStoreType,
-	TestSyncStore,
+	setup_two_nodes, wait_for_tx, TestChainSource, TestStoreType, TestSyncStore,
 };
 use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
 use ldk_node::entropy::NodeEntropy;
@@ -1317,30 +1316,21 @@ async fn async_payment() {
 	config_sender.node_config.node_alias = None;
 	config_sender.log_writer =
 		TestLogWriter::Custom(Arc::new(MultiNodeLogger::new("sender      ".to_string())));
-	let node_sender = setup_node_for_async_payments(
-		&chain_source,
-		config_sender,
-		Some(AsyncPaymentsRole::Client),
-	);
+	config_sender.async_payments_role = Some(AsyncPaymentsRole::Client);
+	let node_sender = setup_node(&chain_source, config_sender);
 
 	let mut config_sender_lsp = random_config(true);
 	config_sender_lsp.log_writer =
 		TestLogWriter::Custom(Arc::new(MultiNodeLogger::new("sender_lsp  ".to_string())));
-	let node_sender_lsp = setup_node_for_async_payments(
-		&chain_source,
-		config_sender_lsp,
-		Some(AsyncPaymentsRole::Server),
-	);
+	config_sender_lsp.async_payments_role = Some(AsyncPaymentsRole::Server);
+	let node_sender_lsp = setup_node(&chain_source, config_sender_lsp);
 
 	let mut config_receiver_lsp = random_config(true);
 	config_receiver_lsp.log_writer =
 		TestLogWriter::Custom(Arc::new(MultiNodeLogger::new("receiver_lsp".to_string())));
+	config_receiver_lsp.async_payments_role = Some(AsyncPaymentsRole::Server);
 
-	let node_receiver_lsp = setup_node_for_async_payments(
-		&chain_source,
-		config_receiver_lsp,
-		Some(AsyncPaymentsRole::Server),
-	);
+	let node_receiver_lsp = setup_node(&chain_source, config_receiver_lsp);
 
 	let mut config_receiver = random_config(true);
 	config_receiver.node_config.listening_addresses = None;