Skip to content

Commit 0f6292b

Browse files
committed
Change DatabaseFactory::build descriptor input to use reference.
1 parent 2694fb3 commit 0f6292b

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/database/any.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ impl DatabaseFactory for AnyDatabaseFactory {
445445

446446
fn build(
447447
&self,
448-
descriptor: ExtendedDescriptor,
448+
descriptor: &ExtendedDescriptor,
449449
network: Network,
450450
secp: &SecpCtx,
451451
) -> Result<Self::Inner, Error> {

src/database/keyvalue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,11 +411,11 @@ impl DatabaseFactory for sled::Db {
411411

412412
fn build(
413413
&self,
414-
descriptor: crate::descriptor::ExtendedDescriptor,
414+
descriptor: &crate::descriptor::ExtendedDescriptor,
415415
network: bitcoin::Network,
416416
secp: &crate::wallet::utils::SecpCtx,
417417
) -> Result<Self::Inner, Error> {
418-
let name = wallet_name_from_descriptor(descriptor, None, network, secp)?;
418+
let name = wallet_name_from_descriptor(descriptor.clone(), None, network, secp)?;
419419
self.open_tree(&name).map_err(Error::Sled)
420420
}
421421
}

src/database/memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ impl DatabaseFactory for MemoryDatabaseFactory {
486486

487487
fn build(
488488
&self,
489-
_descriptor: crate::descriptor::ExtendedDescriptor,
489+
_descriptor: &crate::descriptor::ExtendedDescriptor,
490490
_network: bitcoin::Network,
491491
_secp: &crate::wallet::utils::SecpCtx,
492492
) -> Result<Self::Inner, Error> {

src/database/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ pub trait DatabaseFactory: Sized {
223223
/// Builds the defined [`DatabaseFactory::Inner`] type.
224224
fn build(
225225
&self,
226-
descriptor: ExtendedDescriptor,
226+
descriptor: &ExtendedDescriptor,
227227
network: Network,
228228
secp: &SecpCtx,
229229
) -> Result<Self::Inner, Error>;
@@ -479,7 +479,7 @@ pub mod test {
479479

480480
let mut acc_index = 0_usize;
481481
let mut database = || {
482-
let db = fac.build(descriptor(acc_index), network, &secp).unwrap();
482+
let db = fac.build(&descriptor(acc_index), network, &secp).unwrap();
483483
acc_index += 1;
484484
db
485485
};

src/database/sqlite.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -990,14 +990,14 @@ impl<P: AsRef<Path>> DatabaseFactory for SqliteDatabaseFactory<P> {
990990

991991
fn build(
992992
&self,
993-
descriptor: crate::descriptor::ExtendedDescriptor,
993+
descriptor: &crate::descriptor::ExtendedDescriptor,
994994
network: bitcoin::Network,
995995
secp: &crate::wallet::utils::SecpCtx,
996996
) -> Result<Self::Inner, Error> {
997997
// ensure dir exists
998998
std::fs::create_dir_all(&self.dir).map_err(|e| Error::Generic(e.to_string()))?;
999999

1000-
let name = wallet_name_from_descriptor(descriptor, None, network, secp)?;
1000+
let name = wallet_name_from_descriptor(descriptor.clone(), None, network, secp)?;
10011001
let ext = self.ext.trim_start_matches('.');
10021002

10031003
let mut path = std::path::PathBuf::new();

0 commit comments

Comments
 (0)