Have UpgradeWallet take the version to upgrade to and an error message out parameter

achow101 · achow101 · commit c988f27937bc · 2020-04-13T13:21:18.000-04:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3831,7 +3831,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
     }
 
     if (gArgs.GetBoolArg("-upgradewallet", false)) {
-        if (!UpgradeWallet(walletInstance, error, warnings)) {
+        if (!UpgradeWallet(walletInstance, gArgs.GetBoolArg("-upgradewallet", 0), error, warnings)) {
             return nullptr;
         }
     }
@@ -4097,10 +4097,10 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest
     return &address_book_it->second;
 }
 
-bool CWallet::UpgradeWallet(std::shared_ptr<CWallet> walletInstance, std::string& error, std::vector<std::string>& warnings)
+bool CWallet::UpgradeWallet(std::shared_ptr<CWallet> walletInstance, int version, std::string& error, std::vector<std::string>& warnings)
 {
     int prev_version = walletInstance->GetVersion();
-    int nMaxVersion = gArgs.GetArg("-upgradewallet", 0);
+    int nMaxVersion = version;
     if (nMaxVersion == 0) // the -upgradewallet without argument case
     {
         walletInstance->WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1176,7 +1176,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     };
 
     /** Upgrade the wallet */
-    static bool UpgradeWallet(std::shared_ptr<CWallet> wallet, std::string& error, std::vector<std::string>& warnings);
+    static bool UpgradeWallet(std::shared_ptr<CWallet> wallet, int version, std::string& error, std::vector<std::string>& warnings);
 
     //! Returns all unique ScriptPubKeyMans in m_internal_spk_managers and m_external_spk_managers
     std::set<ScriptPubKeyMan*> GetActiveScriptPubKeyMans() const;

Original file line number	Diff line number	Diff line change
`@@ -3831,7 +3831,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,`
`3831`	`3831`	`}`
`3832`	`3832`
`3833`	`3833`	`if (gArgs.GetBoolArg("-upgradewallet", false)) {`
`3834`		`- if (!UpgradeWallet(walletInstance, error, warnings)) {`
	`3834`	`+ if (!UpgradeWallet(walletInstance, gArgs.GetBoolArg("-upgradewallet", 0), error, warnings)) {`
`3835`	`3835`	`return nullptr;`
`3836`	`3836`	`}`
`3837`	`3837`	`}`
`@@ -4097,10 +4097,10 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest`
`4097`	`4097`	`return &address_book_it->second;`
`4098`	`4098`	`}`
`4099`	`4099`
`4100`		`-bool CWallet::UpgradeWallet(std::shared_ptr<CWallet> walletInstance, std::string& error, std::vector<std::string>& warnings)`
	`4100`	`+bool CWallet::UpgradeWallet(std::shared_ptr<CWallet> walletInstance, int version, std::string& error, std::vector<std::string>& warnings)`
`4101`	`4101`	`{`
`4102`	`4102`	`int prev_version = walletInstance->GetVersion();`
`4103`		`- int nMaxVersion = gArgs.GetArg("-upgradewallet", 0);`
	`4103`	`+ int nMaxVersion = version;`
`4104`	`4104`	`if (nMaxVersion == 0) // the -upgradewallet without argument case`
`4105`	`4105`	`{`
`4106`	`4106`	`walletInstance->WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);`