post-rebase fixups

Eunovo · Jun 27, 2024 · 4632d49 · 4632d49
1 parent 1654ead
commit 4632d49
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
@@ -6,11 +6,8 @@
 
 #include <common/system.h>
 #include <key_io.h>
-<<<<<<< HEAD
 #include <span.h>
-=======
 #include <silentpaymentkey.h>
->>>>>>> 6eb1979623 (Encode and Decode Sp Key tests)
 #include <streams.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -2094,7 +2094,7 @@ isminetype DescriptorScriptPubKeyMan::IsMine(const CScript& script) const
         }
         return ISMINE_NO;
     }
-    
+
     if (m_map_spk_tweaks.count(script) > 0) {
         return ISMINE_SPENDABLE;
     }

diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -607,7 +607,6 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 
 public:
     DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor, int64_t keypool_size);
-
     DescriptorScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size)
         :   ScriptPubKeyMan(storage),
             m_keypool_size(keypool_size)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -60,6 +60,7 @@
 #include <util/string.h>
 #include <util/time.h>
 #include <util/translation.h>
+#include <undo.h>
 #include <wallet/coincontrol.h>
 #include <wallet/context.h>
 #include <wallet/crypter.h>

diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -81,6 +81,7 @@ extern const std::string ORDERPOSNEXT;
 extern const std::string POOL;
 extern const std::string PURPOSE;
 extern const std::string SETTINGS;
+extern const std::string SPTWEAK;
 extern const std::string TX;
 extern const std::string SPTWEAK;
 extern const std::string VERSION;
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             return ISMINE_NO;
         }
         if (m_map_spk_tweaks.count(script) > 0) {
             return ISMINE_SPENDABLE;
         }
@@ Expand Down @@