wallet: rename g_known_wallet_flags constant to KNOWN_WALLET_FLAGS

kallewoof · kallewoof · commit 129a5bafd9a3 · 2019-05-29T18:23:45.000+09:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1571,7 +1571,7 @@ bool CWallet::SetWalletFlags(uint64_t overwriteFlags, bool memonly)
 {
     LOCK(cs_wallet);
     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
         return false;
     }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -139,7 +139,7 @@ enum WalletFlags : uint64_t {
     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
  *

Original file line number	Diff line number	Diff line change
`@@ -1571,7 +1571,7 @@ bool CWallet::SetWalletFlags(uint64_t overwriteFlags, bool memonly)`
`1571`	`1571`	`{`
`1572`	`1572`	`LOCK(cs_wallet);`
`1573`	`1573`	`m_wallet_flags = overwriteFlags;`
`1574`		`- if (((overwriteFlags & g_known_wallet_flags) >> 32) ^ (overwriteFlags >> 32)) {`
	`1574`	`+ if (((overwriteFlags & KNOWN_WALLET_FLAGS) >> 32) ^ (overwriteFlags >> 32)) {`
`1575`	`1575`	`// contains unknown non-tolerable wallet flags`
`1576`	`1576`	`return false;`
`1577`	`1577`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ enum WalletFlags : uint64_t {`
`139`	`139`	`WALLET_FLAG_BLANK_WALLET = (1ULL << 33),`
`140`	`140`	`};`
`141`	`141`
`142`		`-static constexpr uint64_t g_known_wallet_flags = WALLET_FLAG_DISABLE_PRIVATE_KEYS \| WALLET_FLAG_BLANK_WALLET \| WALLET_FLAG_KEY_ORIGIN_METADATA;`
	`142`	`+static constexpr uint64_t KNOWN_WALLET_FLAGS = WALLET_FLAG_DISABLE_PRIVATE_KEYS \| WALLET_FLAG_BLANK_WALLET \| WALLET_FLAG_KEY_ORIGIN_METADATA;`
`143`	`143`
`144`	`144`	`/** A key from a CWallet's keypool`
`145`	`145`	`*`