mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: rename g_known_wallet_flags constant to KNOWN_WALLET_FLAGS

Browse Source
This commit is contained in:
Karl-Johan Alm committed 2019-05-29 18:23:45 +09:00
1 parent ab6d18e6f8
commit 129a5bafd9
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/wallet/wallet.cpp
+1 -1
View File
@@ -1571,7 +1571,7 @@ bool CWallet::SetWalletFlags(uint64_t overwriteFlags, bool memonly)
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
m_wallet_flags = overwriteFlags; m_wallet_flags = overwriteFlags;
if (((overwriteFlags & g_known_wallet_flags) >> 32) ^ (overwriteFlags >> 32)) { if (((overwriteFlags & KNOWN_WALLET_FLAGS) >> 32) ^ (overwriteFlags >> 32)) {
// contains unknown non-tolerable wallet flags // contains unknown non-tolerable wallet flags
return false; return false;
} }
src/wallet/wallet.h
+1 -1
View File
@@ -139,7 +139,7 @@ enum WalletFlags : uint64_t {
WALLET_FLAG_BLANK_WALLET = (1ULL << 33), WALLET_FLAG_BLANK_WALLET = (1ULL << 33),
}; };
static constexpr uint64_t g_known_wallet_flags = WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET | WALLET_FLAG_KEY_ORIGIN_METADATA; static constexpr uint64_t KNOWN_WALLET_FLAGS = WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET | WALLET_FLAG_KEY_ORIGIN_METADATA;
/** A key from a CWallet's keypool /** A key from a CWallet's keypool
* *