From 2eafde1b626a75fc311de43261e0a1c8b69671dc Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Sat, 1 Mar 2025 18:03:01 +0100
Subject: [PATCH] Some cleanup

---
 src/lib.rs                           |  1 -
 src/subcommand/wallet/descriptors.rs |  8 ++++++--
 src/wallet.rs                        |  4 +++-
 src/wallet/database.rs               | 17 ++++++++---------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index b1a1e1f34c..d951a5ac98 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,7 +35,6 @@ use {
     tally::Tally,
   },
   anyhow::{anyhow, bail, ensure, Context, Error},
-  bdk_wallet::{self as bdk, KeychainKind, PersistedWallet},
   bip39::Mnemonic,
   bitcoin::{
     address::{Address, NetworkUnchecked},
diff --git a/src/subcommand/wallet/descriptors.rs b/src/subcommand/wallet/descriptors.rs
index 51e6ad2519..ec83e82d7e 100644
--- a/src/subcommand/wallet/descriptors.rs
+++ b/src/subcommand/wallet/descriptors.rs
@@ -8,7 +8,11 @@ pub struct Output {
 
 pub(crate) fn run(wallet: Wallet) -> SubcommandResult {
   Ok(Some(Box::new(Output {
-    descriptor: wallet.get_descriptor(KeychainKind::External)?.to_string(),
-    change_descriptor: wallet.get_descriptor(KeychainKind::Internal)?.to_string(),
+    descriptor: wallet
+      .get_descriptor(bdk_wallet::KeychainKind::External)?
+      .to_string(),
+    change_descriptor: wallet
+      .get_descriptor(bdk_wallet::KeychainKind::Internal)?
+      .to_string(),
   })))
 }
diff --git a/src/wallet.rs b/src/wallet.rs
index b8f67c47e5..88f9163530 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -1,7 +1,9 @@
 use {
   super::*,
   batch::ParentInfo,
-  bdk_wallet::keys::KeyMap,
+  bdk_wallet::{
+    self as bdk, keys::KeyMap, ChangeSet, KeychainKind, PersistedWallet, WalletPersister,
+  },
   bitcoin::{
     bip32::{ChildNumber, DerivationPath, Xpriv},
     psbt::Psbt,
diff --git a/src/wallet/database.rs b/src/wallet/database.rs
index 947512c45e..e3bdc556d5 100644
--- a/src/wallet/database.rs
+++ b/src/wallet/database.rs
@@ -1,7 +1,6 @@
 use {
   super::*,
-  bdk::{ChangeSet, WalletPersister},
-  std::ops::Deref,
+  // std::ops::Deref,
 };
 
 pub(crate) struct Persister(pub(crate) Arc<Database>);
@@ -37,13 +36,13 @@ impl WalletPersister for Persister {
   }
 }
 
-impl Deref for Persister {
-  type Target = Database;
-
-  fn deref(&self) -> &Self::Target {
-    &self.0
-  }
-}
+//impl Deref for Persister {
+//  type Target = Database;
+//
+//  fn deref(&self) -> &Self::Target {
+//    &self.0
+//  }
+//}
 
 pub(crate) fn create_database(wallet_name: &String, settings: &Settings) -> Result<Database> {
   let path = settings