Move fDecryptionThoroughlyChecked from CWallet to LegacyScriptPubKeyMan

achow101 · achow101 · commit 14b5efd66ff0 · 2019-12-06T15:05:48.000-05:00
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -1396,8 +1396,7 @@ LegacyScriptPubKeyMan::LegacyScriptPubKeyMan(CWallet& wallet)
     : ScriptPubKeyMan(wallet),
       m_wallet(wallet),
       cs_wallet(wallet.cs_wallet),
-      fUseCrypto(wallet.fUseCrypto),
-      fDecryptionThoroughlyChecked(wallet.fDecryptionThoroughlyChecked) {}
+      fUseCrypto(wallet.fUseCrypto) {}
 
 bool LegacyScriptPubKeyMan::SetCrypted() { return m_wallet.SetCrypted(); }
 bool LegacyScriptPubKeyMan::IsCrypted() const { return m_wallet.IsCrypted(); }
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -198,6 +198,9 @@ class ScriptPubKeyMan
 class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProvider
 {
 private:
+    //! keeps track of whether Unlock has run a thorough check before
+    bool fDecryptionThoroughlyChecked = false;
+
     using WatchOnlySet = std::set<CScript>;
     using WatchKeyMap = std::map<CKeyID, CPubKey>;
 
@@ -417,7 +420,6 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
     CWallet& m_wallet;
     CCriticalSection& cs_wallet;
     std::atomic<bool>& fUseCrypto;
-    bool& fDecryptionThoroughlyChecked;
 };
 
 #endif // BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -601,8 +601,6 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
     //! if fUseCrypto is false, vMasterKey must be empty
     std::atomic<bool> fUseCrypto;
 
-    //! keeps track of whether Unlock has run a thorough check before
-    bool fDecryptionThoroughlyChecked;
 
     bool SetCrypted();
     bool Unlock(const CKeyingMaterial& vMasterKeyIn, bool accept_no_keys = false);
@@ -735,7 +733,6 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
     /** Construct wallet with specified name and database implementation. */
     CWallet(interfaces::Chain* chain, const WalletLocation& location, std::unique_ptr<WalletDatabase> database)
         : fUseCrypto(false),
-          fDecryptionThoroughlyChecked(false),
           m_chain(chain),
           m_location(location),
           database(std::move(database))
