discourage refactor

dashpay · Jan 16, 2024 · b159940 · b159940
1 parent f60597e
commit b159940
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4894,14 +4894,14 @@ bool CWallet::UpgradeWallet(int version, bilingual_str& error)
         WalletLogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
     }
 
-    // Discourage users to skip passphrase for HD wallets
-    if (nMaxVersion >= FEATURE_HD && !IsHDEnabled()) {
-        error = Untranslated("You should use upgradetohd RPC to upgrade non-HD wallet to HD");
+    if (nMaxVersion < GetVersion()) {
+        error = Untranslated("Cannot downgrade wallet");
         return false;
     }
 
-    if (nMaxVersion < GetVersion()) {
-        error = Untranslated("Cannot downgrade wallet");
+    // Discourage users to skip passphrase for HD wallets
+    if (nMaxVersion >= FEATURE_HD && !IsHDEnabled()) {
+        error = Untranslated("You should use upgradetohd RPC to upgrade non-HD wallet to HD");
         return false;
     }