refactor: Clean up -Wlogical-op warning

maskoficarus · maskoficarus · commit 95fedd33a23d · 2020-09-29T22:08:54.000-05:00
This commit fixes #19912 by removing a check that always returned true. That check was causing a -Wlogical-op warning because it treated a constant int as though it were a boolean.
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -452,7 +452,7 @@ bool LegacyScriptPubKeyMan::Upgrade(int prev_version, bilingual_str& error)
         hd_upgrade = true;
     }
     // Upgrade to HD chain split if necessary
-    if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT) && CHDChain::VERSION_HD_CHAIN_SPLIT) {
+    if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT)) {
         WalletLogPrintf("Upgrading wallet to use HD chain split\n");
         m_storage.SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL);
         split_upgrade = FEATURE_HD_SPLIT > prev_version;

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ bool LegacyScriptPubKeyMan::Upgrade(int prev_version, bilingual_str& error)`
`452`	`452`	`hd_upgrade = true;`
`453`	`453`	`}`
`454`	`454`	`// Upgrade to HD chain split if necessary`
`455`		`- if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT) && CHDChain::VERSION_HD_CHAIN_SPLIT) {`
	`455`	`+ if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT)) {`
`456`	`456`	`WalletLogPrintf("Upgrading wallet to use HD chain split\n");`
`457`	`457`	`m_storage.SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL);`
`458`	`458`	`split_upgrade = FEATURE_HD_SPLIT > prev_version;`