diff --git a/example-crates/wallet_electrum/src/main.rs b/example-crates/wallet_electrum/src/main.rs index 471caccf..9c77d5df 100644 --- a/example-crates/wallet_electrum/src/main.rs +++ b/example-crates/wallet_electrum/src/main.rs @@ -18,20 +18,16 @@ use bdk_file_store::Store; fn main() -> Result<(), Box> { let db_path = std::env::temp_dir().join("bdk-electrum-example"); - let mut db = Store::::open_or_create_new(DB_MAGIC.as_bytes(), db_path)?; + let db = Store::::open_or_create_new(DB_MAGIC.as_bytes(), db_path)?; let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)"; let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; - let mut wallet = if db.is_empty()? { - Wallet::new( - external_descriptor, - Some(internal_descriptor), - db, - Network::Testnet, - )? - } else { - Wallet::load(external_descriptor, Some(internal_descriptor), db)? - }; + let mut wallet = Wallet::new_or_load( + external_descriptor, + Some(internal_descriptor), + db, + Network::Testnet, + )?; let address = wallet.get_address(bdk::wallet::AddressIndex::New); println!("Generated Address: {}", address); diff --git a/example-crates/wallet_esplora_async/src/main.rs b/example-crates/wallet_esplora_async/src/main.rs index 72a9911d..56c13b77 100644 --- a/example-crates/wallet_esplora_async/src/main.rs +++ b/example-crates/wallet_esplora_async/src/main.rs @@ -2,7 +2,6 @@ use std::{io::Write, str::FromStr}; use bdk::{ bitcoin::{Address, Network}, - chain::PersistBackend, wallet::{AddressIndex, Update}, SignOptions, Wallet, }; @@ -17,20 +16,16 @@ const PARALLEL_REQUESTS: usize = 5; #[tokio::main] async fn main() -> Result<(), Box> { let db_path = std::env::temp_dir().join("bdk-esplora-async-example"); - let mut db = Store::::open_or_create_new(DB_MAGIC.as_bytes(), db_path)?; + let db = Store::::open_or_create_new(DB_MAGIC.as_bytes(), db_path)?; let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)"; let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; - let mut wallet = if db.is_empty()? { - Wallet::new( - external_descriptor, - Some(internal_descriptor), - db, - Network::Testnet, - )? - } else { - Wallet::load(external_descriptor, Some(internal_descriptor), db)? - }; + let mut wallet = Wallet::new_or_load( + external_descriptor, + Some(internal_descriptor), + db, + Network::Testnet, + )?; let address = wallet.get_address(AddressIndex::New); println!("Generated Address: {}", address); diff --git a/example-crates/wallet_esplora_blocking/src/main.rs b/example-crates/wallet_esplora_blocking/src/main.rs index aa434b63..e6173bae 100644 --- a/example-crates/wallet_esplora_blocking/src/main.rs +++ b/example-crates/wallet_esplora_blocking/src/main.rs @@ -7,7 +7,6 @@ use std::{io::Write, str::FromStr}; use bdk::{ bitcoin::{Address, Network}, - chain::PersistBackend, wallet::{AddressIndex, Update}, SignOptions, Wallet, }; @@ -16,20 +15,16 @@ use bdk_file_store::Store; fn main() -> Result<(), Box> { let db_path = std::env::temp_dir().join("bdk-esplora-example"); - let mut db = Store::::open_or_create_new(DB_MAGIC.as_bytes(), db_path)?; + let db = Store::::open_or_create_new(DB_MAGIC.as_bytes(), db_path)?; let external_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/0/*)"; let internal_descriptor = "wpkh(tprv8ZgxMBicQKsPdy6LMhUtFHAgpocR8GC6QmwMSFpZs7h6Eziw3SpThFfczTDh5rW2krkqffa11UpX3XkeTTB2FvzZKWXqPY54Y6Rq4AQ5R8L/84'/1'/0'/1/*)"; - let mut wallet = if db.is_empty()? { - Wallet::new( - external_descriptor, - Some(internal_descriptor), - db, - Network::Testnet, - )? - } else { - Wallet::load(external_descriptor, Some(internal_descriptor), db)? - }; + let mut wallet = Wallet::new_or_load( + external_descriptor, + Some(internal_descriptor), + db, + Network::Testnet, + )?; let address = wallet.get_address(AddressIndex::New); println!("Generated Address: {}", address);