Prefactor: Upgrade to electrum-client v0.22

We upgrade our tests to use `electrum-client` v0.22 and `electrsd` v0.31
to ensure compatibility with `bdk_electrum` were about to start using.

Author: tnull

Cargo.toml

@@ -92,16 +92,16 @@ winapi = { version = "0.3", features = ["winbase"] }
 lightning = { version = "0.1.0", features = ["std", "_test_utils"] }
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
 #lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
-electrum-client = { version = "0.21.0", default-features = true }
-bitcoincore-rpc = { version = "0.19.0", default-features = false }
+electrum-client = { version = "0.22.0", default-features = true }
 proptest = "1.0.0"
 regex = "1.5.6"
 
 [target.'cfg(not(no_download))'.dev-dependencies]
-electrsd = { version = "0.29.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_25_0"] }
+electrsd = { version = "0.33.0", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }
 
 [target.'cfg(no_download)'.dev-dependencies]
-electrsd = { version = "0.29.0", features = ["legacy"] }
+electrsd = { version = "0.33.0", default-features = false, features = ["legacy"] }
+corepc-node = { version = "0.7.0", default-features = false, features = ["27_2"] }
 
 [target.'cfg(cln_test)'.dev-dependencies]
 clightningrpc = { version = "0.3.0-beta.8", default-features = false }

tests/common/mod.rs

@@ -33,11 +33,9 @@ use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use bitcoin::{Address, Amount, Network, OutPoint, Txid};
 
-use bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
-use bitcoincore_rpc::Client as BitcoindClient;
-use bitcoincore_rpc::RpcApi;
-
-use electrsd::{bitcoind, bitcoind::BitcoinD, ElectrsD};
+use electrsd::corepc_node::Client as BitcoindClient;
+use electrsd::corepc_node::Node as BitcoinD;
+use electrsd::{corepc_node, ElectrsD};
 use electrum_client::ElectrumApi;
 
 use rand::distributions::Alphanumeric;
@@ -171,10 +169,10 @@ pub(crate) use expect_payment_successful_event;
 
 pub(crate) fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
 	let bitcoind_exe =
-		env::var("BITCOIND_EXE").ok().or_else(|| bitcoind::downloaded_exe_path().ok()).expect(
+		env::var("BITCOIND_EXE").ok().or_else(|| corepc_node::downloaded_exe_path().ok()).expect(
 			"you need to provide an env var BITCOIND_EXE or specify a bitcoind version feature",
 		);
-	let mut bitcoind_conf = bitcoind::Conf::default();
+	let mut bitcoind_conf = corepc_node::Conf::default();
 	bitcoind_conf.network = "regtest";
 	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();
 
@@ -359,17 +357,14 @@ pub(crate) fn setup_node(
 pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
 	bitcoind: &BitcoindClient, electrs: &E, num: usize,
 ) {
-	let _ = bitcoind.create_wallet("ldk_node_test", None, None, None, None);
+	let _ = bitcoind.create_wallet("ldk_node_test");
 	let _ = bitcoind.load_wallet("ldk_node_test");
 	print!("Generating {} blocks...", num);
-	let cur_height = bitcoind.get_block_count().expect("failed to get current block height");
-	let address = bitcoind
-		.get_new_address(Some("test"), Some(AddressType::Legacy))
-		.expect("failed to get new address")
-		.require_network(bitcoin::Network::Regtest)
-		.expect("failed to get new address");
+	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
+	let cur_height = blockchain_info.blocks;
+	let address = bitcoind.new_address().expect("failed to get new address");
 	// TODO: expect this Result once the WouldBlock issue is resolved upstream.
-	let _block_hashes_res = bitcoind.generate_to_address(num as u64, &address);
+	let _block_hashes_res = bitcoind.generate_to_address(num, &address);
 	wait_for_block(electrs, cur_height as usize + num);
 	print!(" Done!");
 	println!("\n");
@@ -450,13 +445,12 @@ where
 pub(crate) fn premine_and_distribute_funds<E: ElectrumApi>(
 	bitcoind: &BitcoindClient, electrs: &E, addrs: Vec<Address>, amount: Amount,
 ) {
-	let _ = bitcoind.create_wallet("ldk_node_test", None, None, None, None);
+	let _ = bitcoind.create_wallet("ldk_node_test");
 	let _ = bitcoind.load_wallet("ldk_node_test");
 	generate_blocks_and_wait(bitcoind, electrs, 101);
 
 	for addr in addrs {
-		let txid =
-			bitcoind.send_to_address(&addr, amount, None, None, None, None, None, None).unwrap();
+		let txid = bitcoind.send_to_address(&addr, amount).unwrap().0.parse().unwrap();
 		wait_for_tx(electrs, txid);
 	}
 

tests/integration_tests_cln.rs

@@ -18,8 +18,8 @@ use lightning_invoice::{Bolt11InvoiceDescription, Description};
 use clightningrpc::lightningrpc::LightningRPC;
 use clightningrpc::responses::NetworkAddress;
 
-use bitcoincore_rpc::Auth;
-use bitcoincore_rpc::Client as BitcoindClient;
+use electrsd::corepc_client::client_sync::Auth;
+use electrsd::corepc_node::Client as BitcoindClient;
 
 use electrum_client::Client as ElectrumClient;
 use lightning_invoice::Bolt11Invoice;
@@ -33,8 +33,8 @@ use std::str::FromStr;
 #[test]
 fn test_cln() {
 	// Setup bitcoind / electrs clients
-	let bitcoind_client = BitcoindClient::new(
-		"127.0.0.1:18443",
+	let bitcoind_client = BitcoindClient::new_with_auth(
+		"http://127.0.0.1:18443",
 		Auth::UserPass("user".to_string(), "pass".to_string()),
 	)
 	.unwrap();

tests/integration_tests_lnd.rs

@@ -15,8 +15,8 @@ use lnd_grpc_rust::lnrpc::{
 };
 use lnd_grpc_rust::{connect, LndClient};
 
-use bitcoincore_rpc::Auth;
-use bitcoincore_rpc::Client as BitcoindClient;
+use electrsd::corepc_client::client_sync::Auth;
+use electrsd::corepc_node::Client as BitcoindClient;
 
 use electrum_client::Client as ElectrumClient;
 use lightning_invoice::{Bolt11InvoiceDescription, Description};
@@ -30,8 +30,8 @@ use tokio::fs;
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_lnd() {
 	// Setup bitcoind / electrs clients
-	let bitcoind_client = BitcoindClient::new(
-		"127.0.0.1:18443",
+	let bitcoind_client = BitcoindClient::new_with_auth(
+		"http://127.0.0.1:18443",
 		Auth::UserPass("user".to_string(), "pass".to_string()),
 	)
 	.unwrap();

tests/integration_tests_rust.rs

@@ -28,11 +28,11 @@ use lightning::ln::channelmanager::PaymentId;
 use lightning::routing::gossip::{NodeAlias, NodeId};
 use lightning::util::persist::KVStore;
 
-use bitcoincore_rpc::RpcApi;
+use lightning_invoice::{Bolt11InvoiceDescription, Description};
 
 use bitcoin::hashes::Hash;
 use bitcoin::Amount;
-use lightning_invoice::{Bolt11InvoiceDescription, Description};
+
 use log::LevelFilter;
 
 use std::sync::Arc;
@@ -500,16 +500,10 @@ fn onchain_wallet_recovery() {
 
 	let txid = bitcoind
 		.client
-		.send_to_address(
-			&addr_2,
-			Amount::from_sat(premine_amount_sat),
-			None,
-			None,
-			None,
-			None,
-			None,
-			None,
-		)
+		.send_to_address(&addr_2, Amount::from_sat(premine_amount_sat))
+		.unwrap()
+		.0
+		.parse()
 		.unwrap();
 	wait_for_tx(&electrsd.client, txid);
 
@@ -542,16 +536,10 @@ fn onchain_wallet_recovery() {
 
 	let txid = bitcoind
 		.client
-		.send_to_address(
-			&addr_6,
-			Amount::from_sat(premine_amount_sat),
-			None,
-			None,
-			None,
-			None,
-			None,
-			None,
-		)
+		.send_to_address(&addr_6, Amount::from_sat(premine_amount_sat))
+		.unwrap()
+		.0
+		.parse()
 		.unwrap();
 	wait_for_tx(&electrsd.client, txid);