From 7fb4585debca37209d7307d2b4235a575eee172f Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Tue, 25 Jun 2024 13:38:23 +0100 Subject: [PATCH] Renamed bitcoin clients --- .../bitcoin/clients/{btc_electrum_client.rs => electrum.rs} | 0 .../src/bitcoin/clients/{btc_esplora_client.rs => esplora.rs} | 0 side-node/src/bitcoin/clients/mod.rs | 4 ++-- side-node/src/lib.rs | 4 ++-- side-node/tests/side_node.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename side-node/src/bitcoin/clients/{btc_electrum_client.rs => electrum.rs} (100%) rename side-node/src/bitcoin/clients/{btc_esplora_client.rs => esplora.rs} (100%) diff --git a/side-node/src/bitcoin/clients/btc_electrum_client.rs b/side-node/src/bitcoin/clients/electrum.rs similarity index 100% rename from side-node/src/bitcoin/clients/btc_electrum_client.rs rename to side-node/src/bitcoin/clients/electrum.rs diff --git a/side-node/src/bitcoin/clients/btc_esplora_client.rs b/side-node/src/bitcoin/clients/esplora.rs similarity index 100% rename from side-node/src/bitcoin/clients/btc_esplora_client.rs rename to side-node/src/bitcoin/clients/esplora.rs diff --git a/side-node/src/bitcoin/clients/mod.rs b/side-node/src/bitcoin/clients/mod.rs index e24c49e..960b8ac 100644 --- a/side-node/src/bitcoin/clients/mod.rs +++ b/side-node/src/bitcoin/clients/mod.rs @@ -1,2 +1,2 @@ -pub mod btc_electrum_client; -pub mod btc_esplora_client; +pub mod electrum; +pub mod esplora; diff --git a/side-node/src/lib.rs b/side-node/src/lib.rs index c04b469..07b3c5e 100644 --- a/side-node/src/lib.rs +++ b/side-node/src/lib.rs @@ -32,7 +32,7 @@ pub async fn run() { node.start().await; } Some(Commands::Btc {}) => { - let _ = bitcoin::clients::btc_esplora_client::run().await; + let _ = bitcoin::clients::esplora::run().await; } None => println!("No command provided. Exiting. See --help for more information."), } @@ -44,7 +44,7 @@ async fn setup(name: &String) -> SideNode { let side_dir = utils::home(name); let bft_crdt_keys = keys::bft_crdt::load_from_file(&side_dir); let keys = bitcoin::keys::load_from_file(&side_dir).unwrap(); - let bitcoin_wallet = bitcoin::clients::btc_electrum_client::create_wallet(keys).unwrap(); + let bitcoin_wallet = bitcoin::clients::electrum::create_wallet(keys).unwrap(); let crdt = BaseCrdt::::new(&bft_crdt_keys); // Channels for internal communication, and a tokio task for stdin input diff --git a/side-node/tests/side_node.rs b/side-node/tests/side_node.rs index 56f4ab3..c1acce3 100644 --- a/side-node/tests/side_node.rs +++ b/side-node/tests/side_node.rs @@ -39,7 +39,7 @@ async fn setup(_: &str) -> SideNode { let bft_crdt_keys = make_keypair(); let mnemonic_words = bitcoin::keys::make_mnemonic(); let keys = bitcoin::keys::get(mnemonic_words).unwrap(); - let bitcoin_wallet = bitcoin::clients::btc_electrum_client::create_wallet(keys).unwrap(); + let bitcoin_wallet = bitcoin::clients::electrum::create_wallet(keys).unwrap(); let crdt = BaseCrdt::::new(&bft_crdt_keys); // Channels for internal communication, and a tokio task for stdin input