From 5784a95e48cb37e8386bfff3e5d55d4d0174336a Mon Sep 17 00:00:00 2001
From: LLFourn <lloyd.fourn@gmail.com>
Date: Tue, 3 Nov 2020 16:03:04 +1100
Subject: [PATCH] Remove redundant Box around address validators

---
 examples/address_validator.rs   | 2 +-
 src/wallet/address_validator.rs | 6 +++---
 src/wallet/mod.rs               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/address_validator.rs b/examples/address_validator.rs
index f5b3d3cc..d37049c6 100644
--- a/examples/address_validator.rs
+++ b/examples/address_validator.rs
@@ -62,7 +62,7 @@ fn main() -> Result<(), bdk::Error> {
     let mut wallet: OfflineWallet<_> =
         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()?;
diff --git a/src/wallet/address_validator.rs b/src/wallet/address_validator.rs
index 385977d7..1a76feb9 100644
--- a/src/wallet/address_validator.rs
+++ b/src/wallet/address_validator.rs
@@ -67,7 +67,7 @@
 //!
 //! let descriptor = "wpkh(tpubD6NzVbkrYhZ4Xferm7Pz4VnjdcDPFyjVu5K4iZXQ4pVN8Cks4pHVowTBXBKRhX64pkRyJZJN5xAKj4UDNnLPb5p2sSKXhewoYx5GbTdUFWq/*)";
 //! 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()?;
 //! println!("Address: {}", address);
@@ -140,7 +140,7 @@ mod test {
     #[should_panic(expected = "InvalidScript")]
     fn test_address_validator_external() {
         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();
     }
@@ -149,7 +149,7 @@ mod test {
     #[should_panic(expected = "InvalidScript")]
     fn test_address_validator_internal() {
         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);
         wallet
diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs
index 881a2710..16b9d88b 100644
--- a/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@ -89,7 +89,7 @@ pub struct Wallet<B: BlockchainMarker, D: BatchDatabase> {
     signers: Arc<SignersContainer>,
     change_signers: Arc<SignersContainer>,
 
-    address_validators: Vec<Arc<Box<dyn AddressValidator>>>,
+    address_validators: Vec<Arc<dyn AddressValidator>>,
 
     network: Network,
 
@@ -218,7 +218,7 @@ where
     /// Add an address validator
     ///
     /// 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);
     }