wallet/spkm: make GetOldestKeyPoolTime() const

kallewoof · kallewoof · commit 227b9dd2d6e1 · 2020-03-02T17:26:31.000+09:00
The method checks the oldest key time for key pools and returns the oldest. It does no modifications.
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -441,7 +441,7 @@ static int64_t GetOldestKeyTimeInPool(const std::set<int64_t>& setKeyPool, Walle
     return keypool.nTime;
 }
 
-int64_t LegacyScriptPubKeyMan::GetOldestKeyPoolTime()
+int64_t LegacyScriptPubKeyMan::GetOldestKeyPoolTime() const
 {
     LOCK(cs_KeyStore);
 
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -194,7 +194,7 @@ class ScriptPubKeyMan
     //! The action to do when the DB needs rewrite
     virtual void RewriteDB() {}
 
-    virtual int64_t GetOldestKeyPoolTime() { return GetTime(); }
+    virtual int64_t GetOldestKeyPoolTime() const { return GetTime(); }
 
     virtual size_t KeypoolCountExternalKeys() const { return 0; }
     virtual unsigned int GetKeyPoolSize() const { return 0; }
@@ -336,7 +336,7 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
 
     void RewriteDB() override;
 
-    int64_t GetOldestKeyPoolTime() override;
+    int64_t GetOldestKeyPoolTime() const override;
     size_t KeypoolCountExternalKeys() const override;
     unsigned int GetKeyPoolSize() const override;
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3177,7 +3177,7 @@ bool CWallet::GetNewChangeDestination(const OutputType type, CTxDestination& des
     return true;
 }
 
-int64_t CWallet::GetOldestKeyPoolTime()
+int64_t CWallet::GetOldestKeyPoolTime() const
 {
     LOCK(cs_wallet);
     int64_t oldestKey = std::numeric_limits<int64_t>::max();
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -971,7 +971,7 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
     size_t KeypoolCountExternalKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     bool TopUpKeyPool(unsigned int kpSize = 0);
 
-    int64_t GetOldestKeyPoolTime();
+    int64_t GetOldestKeyPoolTime() const;
 
     std::set<std::set<CTxDestination>> GetAddressGroupings() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     std::map<CTxDestination, CAmount> GetAddressBalances(interfaces::Chain::Lock& locked_chain);

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ static int64_t GetOldestKeyTimeInPool(const std::set<int64_t>& setKeyPool, Walle`
`441`	`441`	`return keypool.nTime;`
`442`	`442`	`}`
`443`	`443`
`444`		`-int64_t LegacyScriptPubKeyMan::GetOldestKeyPoolTime()`
	`444`	`+int64_t LegacyScriptPubKeyMan::GetOldestKeyPoolTime() const`
`445`	`445`	`{`
`446`	`446`	`LOCK(cs_KeyStore);`
`447`	`447`
Original file line number	Diff line number	Diff line change
`@@ -3177,7 +3177,7 @@ bool CWallet::GetNewChangeDestination(const OutputType type, CTxDestination& des`
`3177`	`3177`	`return true;`
`3178`	`3178`	`}`
`3179`	`3179`
`3180`		`-int64_t CWallet::GetOldestKeyPoolTime()`
	`3180`	`+int64_t CWallet::GetOldestKeyPoolTime() const`
`3181`	`3181`	`{`
`3182`	`3182`	`LOCK(cs_wallet);`
`3183`	`3183`	`int64_t oldestKey = std::numeric_limits<int64_t>::max();`