refactor: unify WalletBatch's WriteHDChain and WriteCryptedHDChain

dashpay · Mar 5, 2024 · a180d73 · a180d73
1 parent 9c8e458
commit a180d73
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -447,11 +447,11 @@ bool LegacyScriptPubKeyMan::SetCryptedHDChain(WalletBatch &batch, const CHDChain
 
     if (!memonly) {
         if (encrypted_batch) {
-            if (!encrypted_batch->WriteCryptedHDChain(chain))
-                throw std::runtime_error(std::string(__func__) + ": WriteCryptedHDChain failed");
+            if (!encrypted_batch->WriteHDChain(chain))
+                throw std::runtime_error(std::string(__func__) + ": WriteHDChain failed");
         } else {
-            if (!batch.WriteCryptedHDChain(chain))
-                throw std::runtime_error(std::string(__func__) + ": WriteCryptedHDChain failed");
+            if (!batch.WriteHDChain(chain))
+                throw std::runtime_error(std::string(__func__) + ": WriteHDChain failed");
         }
         m_storage.UnsetBlankWalletFlag(batch);
     }

diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -800,17 +800,15 @@ bool WalletBatch::EraseDestData(const std::string &address, const std::string &k
 
 bool WalletBatch::WriteHDChain(const CHDChain& chain)
 {
-    return WriteIC(DBKeys::HDCHAIN, chain);
-}
-
-bool WalletBatch::WriteCryptedHDChain(const CHDChain& chain)
-{
-    if (!WriteIC(DBKeys::CRYPTED_HDCHAIN, chain))
-        return false;
+    if (chain.IsCrypted()) {
+        if (!WriteIC(DBKeys::CRYPTED_HDCHAIN, chain))
+            return false;
 
-    EraseIC(DBKeys::HDCHAIN);
+        EraseIC(DBKeys::HDCHAIN);
 
-    return true;
+        return true;
+    }
+    return WriteIC(DBKeys::HDCHAIN, chain);
 }
 
 bool WalletBatch::WriteHDPubKey(const CHDPubKey& hdPubKey, const CKeyMetadata& keyMeta)

diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -219,7 +219,6 @@ class WalletBatch
 
     //! write the hdchain model (external chain child index counter)
     bool WriteHDChain(const CHDChain& chain);
-    bool WriteCryptedHDChain(const CHDChain& chain);
     bool WriteHDPubKey(const CHDPubKey& hdPubKey, const CKeyMetadata& keyMeta);
 
     bool WriteWalletFlags(const uint64_t flags);