f s/BitcoinRpc/BitcoindRpc/

Author: tnull

tests/common/mod.rs

@@ -244,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 {
@@ -293,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();

tests/integration_tests_rust.rs

@@ -28,7 +28,7 @@ use std::sync::Arc;
 #[test]
 fn channel_full_cycle() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	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);
 }
@@ -44,39 +44,39 @@ fn channel_full_cycle_esplora() {
 #[test]
 fn channel_full_cycle_force_close() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	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, true);
 }
 
 #[test]
 fn channel_full_cycle_force_close_trusted_no_reserve() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpc(&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::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpc(&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::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpc(&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::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 
 	let addr_a = node_a.onchain_payment().new_address().unwrap();
@@ -280,7 +280,7 @@ fn start_stop_reinit() {
 #[test]
 fn onchain_spend_receive() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	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);
 
 	let addr_a = node_a.onchain_payment().new_address().unwrap();
@@ -330,7 +330,7 @@ fn onchain_spend_receive() {
 fn sign_verify_msg() {
 	let (bitcoind, _electrsd) = setup_bitcoind_and_electrsd();
 	let config = random_config(true);
-	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpc(&bitcoind);
 	let node = setup_node(&chain_source, config);
 
 	// Tests arbitrary message signing and later verification
@@ -348,7 +348,7 @@ fn connection_restart_behavior() {
 
 fn do_connection_restart_behavior(persist: bool) {
 	let (bitcoind, _electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::BitcoinRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpc(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, false, false);
 
 	let node_id_a = node_a.node_id();
@@ -400,7 +400,7 @@ fn do_connection_restart_behavior(persist: bool) {
 #[test]
 fn concurrent_connections_succeed() {
 	let (bitcoind, _electrsd) = setup_bitcoind_and_electrsd();
-	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);
 
 	let node_a = Arc::new(node_a);
@@ -431,7 +431,7 @@ fn concurrent_connections_succeed() {
 #[test]
 fn simple_bolt12_send_receive() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	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);
 
 	let address_a = node_a.onchain_payment().new_address().unwrap();
@@ -639,7 +639,7 @@ fn simple_bolt12_send_receive() {
 #[test]
 fn generate_bip21_uri() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	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);
 
 	let address_a = node_a.onchain_payment().new_address().unwrap();
@@ -681,7 +681,7 @@ fn generate_bip21_uri() {
 #[test]
 fn unified_qr_send_receive() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	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);
 
 	let address_a = node_a.onchain_payment().new_address().unwrap();