From fa013aeb8370a7dc0884d9b8b9fd9de23da6fab9 Mon Sep 17 00:00:00 2001 From: Richard Ulrich Date: Thu, 29 Jul 2021 11:11:16 +0200 Subject: [PATCH] moving get_funded_wallet out of the test section to make it available for bdk-reserves --- src/psbt/mod.rs | 2 +- src/wallet/address_validator.rs | 2 +- src/wallet/mod.rs | 106 ++++++++++++++++---------------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/psbt/mod.rs b/src/psbt/mod.rs index bfb7402f6..9ca5e2db7 100644 --- a/src/psbt/mod.rs +++ b/src/psbt/mod.rs @@ -43,8 +43,8 @@ impl PsbtUtils for Psbt { mod test { use crate::bitcoin::TxIn; use crate::psbt::Psbt; - use crate::wallet::test::{get_funded_wallet, get_test_wpkh}; use crate::wallet::AddressIndex; + use crate::wallet::{get_funded_wallet, test::get_test_wpkh}; use crate::SignOptions; use std::str::FromStr; diff --git a/src/wallet/address_validator.rs b/src/wallet/address_validator.rs index 36e39be19..ba6753373 100644 --- a/src/wallet/address_validator.rs +++ b/src/wallet/address_validator.rs @@ -115,8 +115,8 @@ mod test { use std::sync::Arc; use super::*; - use crate::wallet::test::{get_funded_wallet, get_test_wpkh}; use crate::wallet::AddressIndex::New; + use crate::wallet::{get_funded_wallet, test::get_test_wpkh}; #[derive(Debug)] struct TestValidator; diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs index f507d0e20..109a219cb 100644 --- a/src/wallet/mod.rs +++ b/src/wallet/mod.rs @@ -18,6 +18,7 @@ use std::collections::HashMap; use std::collections::{BTreeMap, HashSet}; use std::fmt; use std::ops::{Deref, DerefMut}; +use std::str::FromStr; use std::sync::Arc; use bitcoin::secp256k1::Secp256k1; @@ -55,6 +56,7 @@ use tx_builder::{BumpFee, CreateTx, FeePolicy, TxBuilder, TxParams}; use utils::{check_nlocktime, check_nsequence_rbf, After, Older, SecpCtx, DUST_LIMIT_SATOSHI}; use crate::blockchain::{Blockchain, Progress}; +use crate::database::memory::MemoryDatabase; use crate::database::{BatchDatabase, BatchOperations, DatabaseUtils}; use crate::descriptor::derived::AsDerived; use crate::descriptor::policy::BuildSatisfaction; @@ -66,6 +68,7 @@ use crate::descriptor::{ use crate::error::Error; use crate::psbt::PsbtUtils; use crate::signer::SignerError; +use crate::testutils; use crate::types::*; const CACHE_ADDR_BATCH_SIZE: u32 = 100; @@ -167,6 +170,11 @@ where secp, }) } + + /// Get the Bitcoin network the wallet is using. + pub fn network(&self) -> Network { + self.network + } } /// The address index selection strategy to use to derived an address from the wallet's external @@ -1534,11 +1542,6 @@ where &self.client } - /// Get the Bitcoin network the wallet is using. - pub fn network(&self) -> Network { - self.network - } - /// Broadcast a transaction to the network #[maybe_async] pub fn broadcast(&self, tx: Transaction) -> Result { @@ -1548,19 +1551,60 @@ where } } +/// Return a fake wallet that appears to be funded for testing. +pub fn get_funded_wallet( + descriptor: &str, +) -> ( + Wallet<(), MemoryDatabase>, + (String, Option), + bitcoin::Txid, +) { + let descriptors = testutils!(@descriptors (descriptor)); + let wallet = Wallet::new_offline( + &descriptors.0, + None, + Network::Regtest, + MemoryDatabase::new(), + ) + .unwrap(); + + let funding_address_kix = 0; + + let tx_meta = testutils! { + @tx ( (@external descriptors, funding_address_kix) => 50_000 ) (@confirmations 1) + }; + + wallet + .database + .borrow_mut() + .set_script_pubkey( + &bitcoin::Address::from_str(&tx_meta.output.get(0).unwrap().to_address) + .unwrap() + .script_pubkey(), + KeychainKind::External, + funding_address_kix, + ) + .unwrap(); + wallet + .database + .borrow_mut() + .set_last_index(KeychainKind::External, funding_address_kix) + .unwrap(); + + let txid = crate::populate_test_db!(wallet.database.borrow_mut(), tx_meta, Some(100)); + + (wallet, descriptors, txid) +} + #[cfg(test)] pub(crate) mod test { - use std::str::FromStr; - use bitcoin::{util::psbt, Network}; - use crate::database::memory::MemoryDatabase; use crate::database::Database; use crate::types::KeychainKind; use super::*; use crate::signer::{SignOptions, SignerError}; - use crate::testutils; use crate::wallet::AddressIndex::{LastUnused, New, Peek, Reset}; #[test] @@ -1672,50 +1716,6 @@ pub(crate) mod test { "wsh(and_v(v:pk(cVpPVruEDdmutPzisEsYvtST1usBR3ntr8pXSyt6D2YYqXRyPcFW),after(100000)))" } - pub(crate) fn get_funded_wallet( - descriptor: &str, - ) -> ( - Wallet<(), MemoryDatabase>, - (String, Option), - bitcoin::Txid, - ) { - let descriptors = testutils!(@descriptors (descriptor)); - let wallet = Wallet::new_offline( - &descriptors.0, - None, - Network::Regtest, - MemoryDatabase::new(), - ) - .unwrap(); - - let funding_address_kix = 0; - - let tx_meta = testutils! { - @tx ( (@external descriptors, funding_address_kix) => 50_000 ) (@confirmations 1) - }; - - wallet - .database - .borrow_mut() - .set_script_pubkey( - &bitcoin::Address::from_str(&tx_meta.output.get(0).unwrap().to_address) - .unwrap() - .script_pubkey(), - KeychainKind::External, - funding_address_kix, - ) - .unwrap(); - wallet - .database - .borrow_mut() - .set_last_index(KeychainKind::External, funding_address_kix) - .unwrap(); - - let txid = crate::populate_test_db!(wallet.database.borrow_mut(), tx_meta, Some(100)); - - (wallet, descriptors, txid) - } - macro_rules! assert_fee_rate { ($tx:expr, $fees:expr, $fee_rate:expr $( ,@dust_change $( $dust_change:expr )* )* $( ,@add_signature $( $add_signature:expr )* )* ) => ({ let mut tx = $tx.clone();