From 42f18810b0cb6a082a0649dc4a7eb48679a7a10c Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Fri, 1 Apr 2022 09:14:28 -0700 Subject: [PATCH] Minor cleanup --- src/bdk_cli.rs | 6 +++--- src/lib.rs | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bdk_cli.rs b/src/bdk_cli.rs index 9844d62..93b9fd9 100644 --- a/src/bdk_cli.rs +++ b/src/bdk_cli.rs @@ -71,7 +71,7 @@ const REPL_LINE_SPLIT_REGEX: &str = r#""([^"]*)"|'([^']*)'|([\w\-]+)"#; #[structopt(name = "", setting = AppSettings::NoBinaryName, version = option_env ! ("CARGO_PKG_VERSION").unwrap_or("unknown"), author = option_env ! ("CARGO_PKG_AUTHORS").unwrap_or(""))] -pub enum ReplSubCommand { +enum ReplSubCommand { #[cfg(any( feature = "electrum", feature = "esplora", @@ -127,7 +127,7 @@ fn open_database(wallet_opts: &WalletOpts) -> Result { feature = "compact_filters", feature = "rpc" ))] -pub fn new_blockchain(_network: Network, wallet_opts: &WalletOpts) -> Result { +fn new_blockchain(_network: Network, wallet_opts: &WalletOpts) -> Result { #[cfg(feature = "electrum")] let config = AnyBlockchainConfig::Electrum(ElectrumBlockchainConfig { url: wallet_opts.electrum_opts.server.clone(), @@ -208,7 +208,7 @@ pub fn new_blockchain(_network: Network, wallet_opts: &WalletOpts) -> Result( +fn new_wallet( network: Network, wallet_opts: &WalletOpts, database: D, diff --git a/src/lib.rs b/src/lib.rs index d5d37c9..8b10631 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1428,14 +1428,12 @@ mod test { use bdk::miniscript::bitcoin::network::constants::Network::Testnet; #[cfg(all(feature = "reserves", feature = "electrum"))] use bdk::{ - blockchain::ElectrumBlockchain, database::MemoryDatabase, electrum_client::Client, Wallet, + blockchain::ElectrumBlockchain, database::MemoryDatabase, electrum_client::Client, + SyncOptions, Wallet, }; use std::str::{self, FromStr}; use structopt::StructOpt; - #[cfg(all(feature = "reserves", feature = "electrum",))] - use crate::bdk::SyncOptions; - #[test] fn test_parse_wallet_get_new_address() { let cli_args = vec!["bdk-cli", "--network", "bitcoin", "wallet", -- 2.49.0