wallet: make CanGetAddresses() const

kallewoof · kallewoof · commit 8cd0b8634087 · 2020-03-02T17:26:30.000+09:00
CWallet::CanGetAddresses() is used to check whether the wallet has available or is able to produce keys for addresses. It uses the ScriptPubKeyMan::CanGetAddresses(), which in turn uses the const KeypoolCountExternalKeys() method, all which do counting and no modifications.
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
@@ -468,7 +468,7 @@ class WalletImpl : public Wallet
     }
     unsigned int getConfirmTarget() override { return m_wallet->m_confirm_target; }
     bool hdEnabled() override { return m_wallet->IsHDEnabled(); }
-    bool canGetAddresses() override { return m_wallet->CanGetAddresses(); }
+    bool canGetAddresses() const override { return m_wallet->CanGetAddresses(); }
     bool IsWalletFlagSet(uint64_t flag) override { return m_wallet->IsWalletFlagSet(flag); }
     OutputType getDefaultAddressType() override { return m_wallet->m_default_address_type; }
     OutputType getDefaultChangeType() override { return m_wallet->m_default_change_type; }
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
@@ -246,7 +246,7 @@ class Wallet
     virtual bool hdEnabled() = 0;
 
     // Return whether the wallet is blank.
-    virtual bool canGetAddresses() = 0;
+    virtual bool canGetAddresses() const = 0;
 
     // check if a certain wallet flag is set.
     virtual bool IsWalletFlagSet(uint64_t flag) = 0;
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -358,7 +358,7 @@ bool LegacyScriptPubKeyMan::IsHDEnabled() const
     return !hdChain.seed_id.IsNull();
 }
 
-bool LegacyScriptPubKeyMan::CanGetAddresses(bool internal)
+bool LegacyScriptPubKeyMan::CanGetAddresses(bool internal) const
 {
     LOCK(cs_KeyStore);
     // Check if the keypool has keys
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -184,7 +184,7 @@ class ScriptPubKeyMan
     virtual bool IsHDEnabled() const { return false; }
 
     /* Returns true if the wallet can give out new addresses. This means it has keys in the keypool or can generate new keys */
-    virtual bool CanGetAddresses(bool internal = false) { return false; }
+    virtual bool CanGetAddresses(bool internal = false) const { return false; }
 
     /** Upgrades the wallet to the specified version */
     virtual bool Upgrade(int prev_version, std::string& error) { return false; }
@@ -344,7 +344,7 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
 
     const CKeyMetadata* GetMetadata(const CTxDestination& dest) const override;
 
-    bool CanGetAddresses(bool internal = false) override;
+    bool CanGetAddresses(bool internal = false) const override;
 
     std::unique_ptr<SigningProvider> GetSigningProvider(const CScript& script) const override;
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1333,7 +1333,7 @@ bool CWallet::IsHDEnabled() const
     return result;
 }
 
-bool CWallet::CanGetAddresses(bool internal)
+bool CWallet::CanGetAddresses(bool internal) const
 {
     LOCK(cs_wallet);
     if (m_spk_managers.empty()) return false;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1104,7 +1104,7 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
     bool IsHDEnabled() const;
 
     /* Returns true if the wallet can give out new addresses. This means it has keys in the keypool or can generate new keys */
-    bool CanGetAddresses(bool internal = false);
+    bool CanGetAddresses(bool internal = false) const;
 
     /**
      * Blocks until the wallet state is up-to-date to /at least/ the current

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ class WalletImpl : public Wallet`
`468`	`468`	`}`
`469`	`469`	`unsigned int getConfirmTarget() override { return m_wallet->m_confirm_target; }`
`470`	`470`	`bool hdEnabled() override { return m_wallet->IsHDEnabled(); }`
`471`		`- bool canGetAddresses() override { return m_wallet->CanGetAddresses(); }`
	`471`	`+ bool canGetAddresses() const override { return m_wallet->CanGetAddresses(); }`
`472`	`472`	`bool IsWalletFlagSet(uint64_t flag) override { return m_wallet->IsWalletFlagSet(flag); }`
`473`	`473`	`OutputType getDefaultAddressType() override { return m_wallet->m_default_address_type; }`
`474`	`474`	`OutputType getDefaultChangeType() override { return m_wallet->m_default_change_type; }`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ bool LegacyScriptPubKeyMan::IsHDEnabled() const`
`358`	`358`	`return !hdChain.seed_id.IsNull();`
`359`	`359`	`}`
`360`	`360`
`361`		`-bool LegacyScriptPubKeyMan::CanGetAddresses(bool internal)`
	`361`	`+bool LegacyScriptPubKeyMan::CanGetAddresses(bool internal) const`
`362`	`362`	`{`
`363`	`363`	`LOCK(cs_KeyStore);`
`364`	`364`	`// Check if the keypool has keys`
Original file line number	Diff line number	Diff line change
`@@ -1333,7 +1333,7 @@ bool CWallet::IsHDEnabled() const`
`1333`	`1333`	`return result;`
`1334`	`1334`	`}`
`1335`	`1335`
`1336`		`-bool CWallet::CanGetAddresses(bool internal)`
	`1336`	`+bool CWallet::CanGetAddresses(bool internal) const`
`1337`	`1337`	`{`
`1338`	`1338`	`LOCK(cs_wallet);`
`1339`	`1339`	`if (m_spk_managers.empty()) return false;`