[Wallet] optimize return value of InitLoadWallet()

jonasschnelli · jonasschnelli · commit 15e6e13624e3 · 2016-03-14T09:33:27.000+01:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1427,12 +1427,15 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         std::string warningString;
         std::string errorString;
         pwalletMain = CWallet::InitLoadWallet(fDisableWallet, strWalletFile, warningString, errorString);
-        if (!pwalletMain)
-            return false;
         if (!warningString.empty())
             InitWarning(warningString);
         if (!errorString.empty())
+        {
+            LogPrintf("%s", errorString);
             return InitError(errorString);
+        }
+        if (!pwalletMain)
+            return false;
     }
 #else // ENABLE_WALLET
     LogPrintf("No wallet support compiled in!\n");
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3002,6 +3002,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
         CWallet *tempWallet = new CWallet(strWalletFile);
         DBErrors nZapWalletRet = tempWallet->ZapWalletTx(vWtx);
         if (nZapWalletRet != DB_LOAD_OK) {
+            errorString = _("Error loading wallet.dat: Wallet corrupted");
             uiInterface.InitMessage(_("Error loading wallet.dat: Wallet corrupted"));
             return NULL;
         }
@@ -3031,10 +3032,12 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
         {
             errorString += strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)) + "\n";
             LogPrintf("%s", errorString);
-            return walletInstance;
         }
         else
             errorString += _("Error loading wallet.dat") + "\n";
+
+        if (!errorString.empty())
+            return NULL;
     }
 
     if (GetBoolArg("-upgradewallet", fFirstRun))
@@ -3049,7 +3052,10 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
         else
             LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
         if (nMaxVersion < walletInstance->GetVersion())
+        {
             errorString += _("Cannot downgrade wallet") + "\n";
+            return NULL;
+        }
         walletInstance->SetMaxVersion(nMaxVersion);
     }
 
@@ -3062,13 +3068,15 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
             walletInstance->SetDefaultKey(newDefaultKey);
             if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive"))
+            {
                 errorString += _("Cannot write default address") += "\n";
+                return NULL;
+            }
         }
 
         walletInstance->SetBestChain(chainActive.GetLocator());
     }
 
-    LogPrintf("%s", errorString);
     LogPrintf(" wallet      %15dms\n", GetTimeMillis() - nStart);
 
     RegisterValidationInterface(walletInstance);
@@ -3099,7 +3107,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall
             if (pindexRescan != block)
             {
                 errorString = _("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)");
-                return walletInstance;
+                return NULL;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3002,6 +3002,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall`
`3002`	`3002`	`CWallet *tempWallet = new CWallet(strWalletFile);`
`3003`	`3003`	`DBErrors nZapWalletRet = tempWallet->ZapWalletTx(vWtx);`
`3004`	`3004`	`if (nZapWalletRet != DB_LOAD_OK) {`
	`3005`	`+ errorString = _("Error loading wallet.dat: Wallet corrupted");`
`3005`	`3006`	`uiInterface.InitMessage(_("Error loading wallet.dat: Wallet corrupted"));`
`3006`	`3007`	`return NULL;`
`3007`	`3008`	`}`
`@@ -3031,10 +3032,12 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall`
`3031`	`3032`	`{`
`3032`	`3033`	`errorString += strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)) + "\n";`
`3033`	`3034`	`LogPrintf("%s", errorString);`
`3034`		`- return walletInstance;`
`3035`	`3035`	`}`
`3036`	`3036`	`else`
`3037`	`3037`	`errorString += _("Error loading wallet.dat") + "\n";`
	`3038`	`+`
	`3039`	`+ if (!errorString.empty())`
	`3040`	`+ return NULL;`
`3038`	`3041`	`}`
`3039`	`3042`
`3040`	`3043`	`if (GetBoolArg("-upgradewallet", fFirstRun))`
`@@ -3049,7 +3052,10 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall`
`3049`	`3052`	`else`
`3050`	`3053`	`LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);`
`3051`	`3054`	`if (nMaxVersion < walletInstance->GetVersion())`
	`3055`	`+ {`
`3052`	`3056`	`errorString += _("Cannot downgrade wallet") + "\n";`
	`3057`	`+ return NULL;`
	`3058`	`+ }`
`3053`	`3059`	`walletInstance->SetMaxVersion(nMaxVersion);`
`3054`	`3060`	`}`
`3055`	`3061`
`@@ -3062,13 +3068,15 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall`
`3062`	`3068`	`if (walletInstance->GetKeyFromPool(newDefaultKey)) {`
`3063`	`3069`	`walletInstance->SetDefaultKey(newDefaultKey);`
`3064`	`3070`	`if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive"))`
	`3071`	`+ {`
`3065`	`3072`	`errorString += _("Cannot write default address") += "\n";`
	`3073`	`+ return NULL;`
	`3074`	`+ }`
`3066`	`3075`	`}`
`3067`	`3076`
`3068`	`3077`	`walletInstance->SetBestChain(chainActive.GetLocator());`
`3069`	`3078`	`}`
`3070`	`3079`
`3071`		`- LogPrintf("%s", errorString);`
`3072`	`3080`	`LogPrintf(" wallet %15dms\n", GetTimeMillis() - nStart);`
`3073`	`3081`
`3074`	`3082`	`RegisterValidationInterface(walletInstance);`
`@@ -3099,7 +3107,7 @@ CWallet* CWallet::InitLoadWallet(bool fDisableWallet, const std::string& strWall`
`3099`	`3107`	`if (pindexRescan != block)`
`3100`	`3108`	`{`
`3101`	`3109`	`errorString = _("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)");`
`3102`		`- return walletInstance;`
	`3110`	`+ return NULL;`
`3103`	`3111`	`}`
`3104`	`3112`	`}`
`3105`	`3113`