f Drop unnecessary preminig

.. and `s/BitcoinRpc/BitcoindRpc/`

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;
 
@@ -245,7 +244,7 @@ type TestNode = Node;
 #[derive(Clone)]
 pub(crate) enum TestChainSource<'a> {
 	Esplora(&'a ElectrsD),
-	BitcoinRpc(&'a BitcoinD),
+	BitcoindRpc(&'a BitcoinD),
 }
 
 macro_rules! setup_builder {
@@ -294,7 +293,7 @@ pub(crate) fn setup_node(chain_source: &TestChainSource, config: Config) -> Test
 			sync_config.lightning_wallet_sync_interval_secs = 100000;
 			builder.set_chain_source_esplora(esplora_url.clone(), Some(sync_config));
 		},
-		TestChainSource::BitcoinRpc(bitcoind) => {
+		TestChainSource::BitcoindRpc(bitcoind) => {
 			let rpc_host = bitcoind.params.rpc_socket.ip().to_string();
 			let rpc_port = bitcoind.params.rpc_socket.port();
 			let values = bitcoind.params.get_cookie_values().unwrap().unwrap();
@@ -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,7 +10,7 @@ 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,
+	premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd,
 	setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
 };
 
@@ -21,7 +21,7 @@ use ldk_node::{Builder, Event, NodeError};
 use lightning::ln::channelmanager::PaymentId;
 use lightning::util::persist::KVStore;
 
-use bitcoin::{Amount, Network};
+use bitcoin::Amount;
 
 use std::sync::Arc;
 
@@ -36,8 +36,7 @@ fn channel_full_cycle() {
 #[test]
 fn channel_full_cycle_bitcoind() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	premine_dummy_blocks(&bitcoind.client, &electrsd.client);
-	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpc(&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);
 }