Remove deprecated address validators

Author: afilini

Cargo.toml

@@ -102,8 +102,6 @@ lazy_static = "1.4"
 env_logger = "0.7"
 electrsd = "0.21"
 
-[[example]]
-name = "address_validator"
 [[example]]
 name = "compact_filters_balance"
 required-features = ["compact_filters"]

examples/address_validator.rs

@@ -12,7 +12,7 @@
 use std::fmt;
 
 use crate::bitcoin::Network;
-use crate::{descriptor, wallet, wallet::address_validator};
+use crate::{descriptor, wallet};
 use bitcoin::{OutPoint, Txid};
 
 /// Errors that can be thrown by the [`Wallet`](crate::wallet::Wallet)
@@ -99,8 +99,6 @@ pub enum Error {
 
     /// Error related to the parsing and usage of descriptors
     Descriptor(crate::descriptor::error::Error),
-    /// Error that can be returned to fail the validation of an address
-    AddressValidator(crate::wallet::address_validator::AddressValidatorError),
     /// Encoding error
     Encode(bitcoin::consensus::encode::Error),
     /// Miniscript error
@@ -191,7 +189,6 @@ macro_rules! impl_error {
 }
 
 impl_error!(descriptor::error::Error, Descriptor);
-impl_error!(address_validator::AddressValidatorError, AddressValidator);
 impl_error!(descriptor::policy::PolicyError, InvalidPolicyPathError);
 impl_error!(wallet::signer::SignerError, Signer);
 

src/error.rs

@@ -271,7 +271,6 @@ pub use descriptor::template;
 pub use descriptor::HdKeyPaths;
 pub use error::Error;
 pub use types::*;
-pub use wallet::address_validator;
 pub use wallet::signer;
 pub use wallet::signer::SignOptions;
 pub use wallet::tx_builder::TxBuilder;

src/lib.rs

@@ -35,7 +35,6 @@ use miniscript::psbt::{PsbtExt, PsbtInputExt, PsbtInputSatisfier};
 #[allow(unused_imports)]
 use log::{debug, error, info, trace};
 
-pub mod address_validator;
 pub mod coin_selection;
 pub mod export;
 pub mod signer;
@@ -52,8 +51,6 @@ pub mod hardwaresigner;
 
 pub use utils::IsDust;
 
-#[allow(deprecated)]
-use address_validator::AddressValidator;
 use coin_selection::DefaultCoinSelectionAlgorithm;
 use signer::{SignOptions, SignerOrdering, SignersContainer, TransactionSigner};
 use tx_builder::{BumpFee, CreateTx, FeePolicy, TxBuilder, TxParams};
@@ -96,9 +93,6 @@ pub struct Wallet<D> {
     signers: Arc<SignersContainer>,
     change_signers: Arc<SignersContainer>,
 
-    #[allow(deprecated)]
-    address_validators: Vec<Arc<dyn AddressValidator>>,
-
     network: Network,
 
     database: RefCell<D>,
@@ -232,7 +226,6 @@ where
             change_descriptor,
             signers,
             change_signers,
-            address_validators: Vec::new(),
             network,
             database: RefCell::new(database),
             secp,
@@ -548,24 +541,6 @@ where
         }
     }
 
-    /// Add an address validator
-    ///
-    /// See [the `address_validator` module](address_validator) for an example.
-    #[deprecated]
-    #[allow(deprecated)]
-    pub fn add_address_validator(&mut self, validator: Arc<dyn AddressValidator>) {
-        self.address_validators.push(validator);
-    }
-
-    /// Get the address validators
-    ///
-    /// See [the `address_validator` module](address_validator).
-    #[deprecated]
-    #[allow(deprecated)]
-    pub fn get_address_validators(&self) -> &[Arc<dyn AddressValidator>] {
-        &self.address_validators
-    }
-
     /// Start building a transaction.
     ///
     /// This returns a blank [`TxBuilder`] from which you can specify the parameters for the transaction.
@@ -1346,16 +1321,6 @@ where
             self.cache_addresses(keychain, index, CACHE_ADDR_BATCH_SIZE)?;
         }
 
-        // TODO: remove address validators entirely
-        //
-        // let derived_descriptor = descriptor.at_derivation_index(index);
-        // let hd_keypaths = derived_descriptor.get_hd_keypaths(&self.secp);
-        // let script = derived_descriptor.script_pubkey();
-        // for validator in &self.address_validators {
-        //     #[allow(deprecated)]
-        //     validator.validate(keychain, &hd_keypaths, &script)?;
-        // }
-
         Ok(index)
     }