frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant Box around address validators

Browse Source
This commit is contained in:
LLFourn 2020-11-03 16:03:04 +11:00
parent 30f1ff5ab5
commit 5784a95e48
No known key found for this signature in database
GPG Key ID: A27093B54DA11F65
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/address_validator.rs
View File

@ -62,7 +62,7 @@ fn main() -> Result<(), bdk::Error> {
let mut wallet: OfflineWallet<_> = let mut wallet: OfflineWallet<_> =
Wallet::new_offline(descriptor, None, Network::Regtest, MemoryDatabase::new())?; Wallet::new_offline(descriptor, None, Network::Regtest, MemoryDatabase::new())?;
wallet.add_address_validator(Arc::new(Box::new(DummyValidator))); wallet.add_address_validator(Arc::new(DummyValidator));
wallet.get_new_address()?; wallet.get_new_address()?;
wallet.get_new_address()?; wallet.get_new_address()?;

6
src/wallet/address_validator.rs
View File

@ -67,7 +67,7 @@
//! //!
//! let descriptor = "wpkh(tpubD6NzVbkrYhZ4Xferm7Pz4VnjdcDPFyjVu5K4iZXQ4pVN8Cks4pHVowTBXBKRhX64pkRyJZJN5xAKj4UDNnLPb5p2sSKXhewoYx5GbTdUFWq/*)"; //! let descriptor = "wpkh(tpubD6NzVbkrYhZ4Xferm7Pz4VnjdcDPFyjVu5K4iZXQ4pVN8Cks4pHVowTBXBKRhX64pkRyJZJN5xAKj4UDNnLPb5p2sSKXhewoYx5GbTdUFWq/*)";
//! let mut wallet: OfflineWallet<_> = Wallet::new_offline(descriptor, None, Network::Testnet, MemoryDatabase::default())?; //! let mut wallet: OfflineWallet<_> = Wallet::new_offline(descriptor, None, Network::Testnet, MemoryDatabase::default())?;
//! wallet.add_address_validator(Arc::new(Box::new(PrintAddressAndContinue))); //! wallet.add_address_validator(Arc::new(PrintAddressAndContinue));
//! //!
//! let address = wallet.get_new_address()?; //! let address = wallet.get_new_address()?;
//! println!("Address: {}", address); //! println!("Address: {}", address);
@ -140,7 +140,7 @@ mod test {
#[should_panic(expected = "InvalidScript")] #[should_panic(expected = "InvalidScript")]
fn test_address_validator_external() { fn test_address_validator_external() {
let (mut wallet, _, _) = get_funded_wallet(get_test_wpkh()); let (mut wallet, _, _) = get_funded_wallet(get_test_wpkh());
wallet.add_address_validator(Arc::new(Box::new(TestValidator))); wallet.add_address_validator(Arc::new(TestValidator));
wallet.get_new_address().unwrap(); wallet.get_new_address().unwrap();
} }
@ -149,7 +149,7 @@ mod test {
#[should_panic(expected = "InvalidScript")] #[should_panic(expected = "InvalidScript")]
fn test_address_validator_internal() { fn test_address_validator_internal() {
let (mut wallet, descriptors, _) = get_funded_wallet(get_test_wpkh()); let (mut wallet, descriptors, _) = get_funded_wallet(get_test_wpkh());
wallet.add_address_validator(Arc::new(Box::new(TestValidator))); wallet.add_address_validator(Arc::new(TestValidator));
let addr = testutils!(@external descriptors, 10); let addr = testutils!(@external descriptors, 10);
wallet wallet

4
src/wallet/mod.rs
View File

@ -89,7 +89,7 @@ pub struct Wallet<B: BlockchainMarker, D: BatchDatabase> {
signers: Arc<SignersContainer>, signers: Arc<SignersContainer>,
change_signers: Arc<SignersContainer>, change_signers: Arc<SignersContainer>,
address_validators: Vec<Arc<Box<dyn AddressValidator>>>, address_validators: Vec<Arc<dyn AddressValidator>>,
network: Network, network: Network,
@ -218,7 +218,7 @@ where
/// Add an address validator /// Add an address validator
/// ///
/// See [the `address_validator` module](address_validator) for an example. /// See [the `address_validator` module](address_validator) for an example.
pub fn add_address_validator(&mut self, validator: Arc<Box<dyn AddressValidator>>) { pub fn add_address_validator(&mut self, validator: Arc<dyn AddressValidator>) {
self.address_validators.push(validator); self.address_validators.push(validator);
} }