wallet: make getters const

kallewoof · kallewoof · commit df3a818d2a9f · 2020-03-02T17:27:35.000+09:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3201,7 +3201,7 @@ void CWallet::MarkDestinationsDirty(const std::set<CTxDestination>& destinations
     }
 }
 
-std::map<CTxDestination, CAmount> CWallet::GetAddressBalances(interfaces::Chain::Lock& locked_chain)
+std::map<CTxDestination, CAmount> CWallet::GetAddressBalances(interfaces::Chain::Lock& locked_chain) const
 {
     std::map<CTxDestination, CAmount> balances;
 
@@ -3242,7 +3242,7 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances(interfaces::Chain:
     return balances;
 }
 
-std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings()
+std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings() const
 {
     AssertLockHeld(cs_wallet);
     std::set< std::set<CTxDestination> > groupings;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -832,8 +832,8 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
      * Rescan abort properties
      */
     void AbortRescan() { fAbortRescan = true; }
-    bool IsAbortingRescan() { return fAbortRescan; }
-    bool IsScanning() { return fScanningWallet; }
+    bool IsAbortingRescan() const { return fAbortRescan; }
+    bool IsScanning() const { return fScanningWallet; }
     int64_t ScanningDuration() const { return fScanningWallet ? GetTimeMillis() - m_scanning_start : 0; }
     double ScanningProgress() const { return fScanningWallet ? (double) m_scanning_progress : 0; }
 
@@ -973,8 +973,8 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
 
     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);
+    std::set<std::set<CTxDestination>> GetAddressGroupings() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    std::map<CTxDestination, CAmount> GetAddressBalances(interfaces::Chain::Lock& locked_chain) const;
 
     std::set<CTxDestination> GetLabelAddresses(const std::string& label) const;
 
@@ -1027,7 +1027,7 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
     bool SetMaxVersion(int nVersion);
 
     //! get the current wallet format (the oldest client version guaranteed to understand this wallet)
-    int GetVersion() { LOCK(cs_wallet); return nWalletVersion; }
+    int GetVersion() const { LOCK(cs_wallet); return nWalletVersion; }
 
     //! Get wallet transactions that conflict with given transaction (spend same outputs)
     std::set<uint256> GetConflicts(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);

Original file line number	Diff line number	Diff line change
`@@ -3201,7 +3201,7 @@ void CWallet::MarkDestinationsDirty(const std::set<CTxDestination>& destinations`
`3201`	`3201`	`}`
`3202`	`3202`	`}`
`3203`	`3203`
`3204`		`-std::map<CTxDestination, CAmount> CWallet::GetAddressBalances(interfaces::Chain::Lock& locked_chain)`
	`3204`	`+std::map<CTxDestination, CAmount> CWallet::GetAddressBalances(interfaces::Chain::Lock& locked_chain) const`
`3205`	`3205`	`{`
`3206`	`3206`	`std::map<CTxDestination, CAmount> balances;`
`3207`	`3207`
`@@ -3242,7 +3242,7 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances(interfaces::Chain:`
`3242`	`3242`	`return balances;`
`3243`	`3243`	`}`
`3244`	`3244`
`3245`		`-std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings()`
	`3245`	`+std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings() const`
`3246`	`3246`	`{`
`3247`	`3247`	`AssertLockHeld(cs_wallet);`
`3248`	`3248`	`std::set< std::set<CTxDestination> > groupings;`