Remove DatabaseFactory::build_with_change

Author: evanlinjin

src/database/any.rs

@@ -443,25 +443,24 @@ pub enum AnyDatabaseFactory {
 impl DatabaseFactory for AnyDatabaseFactory {
     type Inner = AnyDatabase;
 
-    fn build_with_change(
+    fn build(
         &self,
         descriptor: ExtendedDescriptor,
-        change_descriptor: Option<ExtendedDescriptor>,
         network: Network,
         secp: &SecpCtx,
     ) -> Result<Self::Inner, Error> {
         match self {
-            AnyDatabaseFactory::Memory(f) => f
-                .build_with_change(descriptor, change_descriptor, network, secp)
-                .map(Self::Inner::Memory),
+            AnyDatabaseFactory::Memory(f) => {
+                f.build(descriptor, network, secp).map(Self::Inner::Memory)
+            }
             #[cfg(feature = "key-value-db")]
-            AnyDatabaseFactory::Sled(f) => f
-                .build_with_change(descriptor, change_descriptor, network, secp)
-                .map(Self::Inner::Sled),
+            AnyDatabaseFactory::Sled(f) => {
+                f.build(descriptor, network, secp).map(Self::Inner::Sled)
+            }
             #[cfg(feature = "sqlite")]
-            AnyDatabaseFactory::Sqlite(f) => f
-                .build_with_change(descriptor, change_descriptor, network, secp)
-                .map(Self::Inner::Sqlite),
+            AnyDatabaseFactory::Sqlite(f) => {
+                f.build(descriptor, network, secp).map(Self::Inner::Sqlite)
+            }
         }
     }
 }

src/database/keyvalue.rs

@@ -409,14 +409,13 @@ impl BatchDatabase for Tree {
 impl DatabaseFactory for sled::Db {
     type Inner = sled::Tree;
 
-    fn build_with_change(
+    fn build(
         &self,
         descriptor: crate::descriptor::ExtendedDescriptor,
-        change_descriptor: Option<crate::descriptor::ExtendedDescriptor>,
         network: bitcoin::Network,
         secp: &crate::wallet::utils::SecpCtx,
     ) -> Result<Self::Inner, Error> {
-        let name = wallet_name_from_descriptor(descriptor, change_descriptor, network, secp)?;
+        let name = wallet_name_from_descriptor(descriptor, None, network, secp)?;
         self.open_tree(&name).map_err(Error::Sled)
     }
 }

src/database/memory.rs

@@ -484,10 +484,9 @@ pub struct MemoryDatabaseFactory;
 impl DatabaseFactory for MemoryDatabaseFactory {
     type Inner = MemoryDatabase;
 
-    fn build_with_change(
+    fn build(
         &self,
         _descriptor: crate::descriptor::ExtendedDescriptor,
-        _change_descriptor: Option<crate::descriptor::ExtendedDescriptor>,
         _network: bitcoin::Network,
         _secp: &crate::wallet::utils::SecpCtx,
     ) -> Result<Self::Inner, Error> {

src/database/mod.rs

@@ -226,17 +226,6 @@ pub trait DatabaseFactory: Sized {
         descriptor: ExtendedDescriptor,
         network: Network,
         secp: &SecpCtx,
-    ) -> Result<Self::Inner, Error> {
-        self.build_with_change(descriptor, None, network, secp)
-    }
-
-    /// Builds the defined [`DatabaseFactory::Inner`] type with the addition of a change descriptor.
-    fn build_with_change(
-        &self,
-        descriptor: ExtendedDescriptor,
-        change_descriptor: Option<ExtendedDescriptor>,
-        network: Network,
-        secp: &SecpCtx,
     ) -> Result<Self::Inner, Error>;
 }
 

src/database/sqlite.rs

@@ -988,17 +988,16 @@ pub struct SqliteDatabaseFactory<P> {
 impl<P: AsRef<Path>> DatabaseFactory for SqliteDatabaseFactory<P> {
     type Inner = SqliteDatabase;
 
-    fn build_with_change(
+    fn build(
         &self,
         descriptor: crate::descriptor::ExtendedDescriptor,
-        change_descriptor: Option<crate::descriptor::ExtendedDescriptor>,
         network: bitcoin::Network,
         secp: &crate::wallet::utils::SecpCtx,
     ) -> Result<Self::Inner, Error> {
         // ensure dir exists
         std::fs::create_dir_all(&self.dir).map_err(|e| Error::Generic(e.to_string()))?;
 
-        let name = wallet_name_from_descriptor(descriptor, change_descriptor, network, secp)?;
+        let name = wallet_name_from_descriptor(descriptor, None, network, secp)?;
         let ext = self.ext.trim_start_matches('.');
 
         let mut path = std::path::PathBuf::new();