f Default to use BitcoindRpc in tests

Author: tnull

tests/common/mod.rs

@@ -36,7 +36,6 @@ use rand::{thread_rng, Rng};
 
 use std::env;
 use std::path::PathBuf;
-use std::str::FromStr;
 use std::sync::{Arc, RwLock};
 use std::time::Duration;
 
@@ -402,40 +401,6 @@ where
 	}
 }
 
-// Premine dummy blocks to populate estimatesmartfee
-pub(crate) fn premine_dummy_blocks<E: ElectrumApi>(bitcoind: &BitcoindClient, electrs: &E) {
-	let _ = bitcoind.create_wallet("ldk_node_test", None, None, None, None);
-	let _ = bitcoind.load_wallet("ldk_node_test");
-	let mut rng = thread_rng();
-
-	generate_blocks_and_wait(bitcoind, electrs, 101);
-
-	let amount = Amount::from_sat(100000);
-	for i in 0..5 {
-		println!("Pre-mining block {}", i);
-		let num_txs = rng.gen_range(10..42);
-		let mut last_txid = None;
-		for _ in 10..num_txs {
-			let dummy_address: Address =
-				Address::from_str("bcrt1qh3mvjaldwxynmmwsmx4az4vdg5yj7sjzjpdga5")
-					.unwrap()
-					.require_network(Network::Regtest)
-					.unwrap();
-			let txid = bitcoind
-				.send_to_address(&dummy_address, amount, None, None, None, None, Some(1), None)
-				.unwrap();
-			println!("Created dummy transaction {}", txid);
-			last_txid = Some(txid);
-		}
-		if let Some(last_txid) = last_txid {
-			wait_for_tx(electrs, last_txid);
-		}
-		generate_blocks_and_wait(bitcoind, electrs, 1);
-	}
-
-	generate_blocks_and_wait(bitcoind, electrs, 1);
-}
-
 pub(crate) fn premine_and_distribute_funds<E: ElectrumApi>(
 	bitcoind: &BitcoindClient, electrs: &E, addrs: Vec<Address>, amount: Amount,
 ) {

tests/integration_tests_rust.rs

@@ -10,8 +10,8 @@ mod common;
 use common::{
 	do_channel_full_cycle, expect_channel_ready_event, expect_event, expect_payment_received_event,
 	expect_payment_successful_event, generate_blocks_and_wait, open_channel,
-	premine_and_distribute_funds, premine_dummy_blocks, random_config, setup_bitcoind_and_electrsd,
-	setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
+	premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd, setup_builder,
+	setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
 };
 
 use ldk_node::config::EsploraSyncConfig;
@@ -28,56 +28,55 @@ use std::sync::Arc;
 #[test]
 fn channel_full_cycle() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, false, true, false);
 }
 
 #[test]
-fn channel_full_cycle_bitcoind() {
+fn channel_full_cycle_esplora() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	premine_dummy_blocks(&bitcoind.client, &electrsd.client);
-	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::Esplora(&electrsd);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, false, true, false);
 }
 
 #[test]
 fn channel_full_cycle_force_close() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, false, true, true);
 }
 
 #[test]
 fn channel_full_cycle_force_close_trusted_no_reserve() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, true);
 	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, false, true, true);
 }
 
 #[test]
 fn channel_full_cycle_0conf() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, true, true, false);
 	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, true, true, false)
 }
 
 #[test]
 fn channel_full_cycle_legacy_staticremotekey() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, false, false);
 	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, false, false, false);
 }
 
 #[test]
 fn channel_open_fails_when_funds_insufficient() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 
 	let addr_a = node_a.onchain_payment().new_address().unwrap();
@@ -281,7 +280,7 @@ fn start_stop_reinit() {
 #[test]
 fn onchain_spend_receive() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 
 	let addr_a = node_a.onchain_payment().new_address().unwrap();
@@ -329,9 +328,9 @@ fn onchain_spend_receive() {
 
 #[test]
 fn sign_verify_msg() {
-	let (_bitcoind, electrsd) = setup_bitcoind_and_electrsd();
+	let (bitcoind, _electrsd) = setup_bitcoind_and_electrsd();
 	let config = random_config(true);
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let node = setup_node(&chain_source, config);
 
 	// Tests arbitrary message signing and later verification
@@ -348,8 +347,8 @@ fn connection_restart_behavior() {
 }
 
 fn do_connection_restart_behavior(persist: bool) {
-	let (_bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let (bitcoind, _electrsd) = setup_bitcoind_and_electrsd();
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, false, false);
 
 	let node_id_a = node_a.node_id();
@@ -400,8 +399,8 @@ fn do_connection_restart_behavior(persist: bool) {
 
 #[test]
 fn concurrent_connections_succeed() {
-	let (_bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let (bitcoind, _electrsd) = setup_bitcoind_and_electrsd();
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 
 	let node_a = Arc::new(node_a);
@@ -432,7 +431,7 @@ fn concurrent_connections_succeed() {
 #[test]
 fn simple_bolt12_send_receive() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 
 	let address_a = node_a.onchain_payment().new_address().unwrap();
@@ -640,7 +639,7 @@ fn simple_bolt12_send_receive() {
 #[test]
 fn generate_bip21_uri() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 
 	let address_a = node_a.onchain_payment().new_address().unwrap();
@@ -682,7 +681,7 @@ fn generate_bip21_uri() {
 #[test]
 fn unified_qr_send_receive() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 
 	let address_a = node_a.onchain_payment().new_address().unwrap();