aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSishir Giri <sishirg27@gmail.com>2020-10-12 14:05:24 -0700
committerSishir Giri <sishirg27@gmail.com>2020-11-16 13:22:42 -0800
commit963696288955dc31b3a4fd136bfb791a9d99755b (patch)
tree4b2e6c80534717624f5a26f4801be250c8dc9973
parent543693b92b954d186cb466a2f14b480f3bcf8c0b (diff)
downloadbitcoin-963696288955dc31b3a4fd136bfb791a9d99755b.tar.xz
[upgradewallet] removed unused warning param
-rw-r--r--src/wallet/rpcwallet.cpp4
-rw-r--r--src/wallet/wallet.cpp2
-rw-r--r--src/wallet/wallet.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ebcab1227d..0d0fda26fd 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4473,10 +4473,8 @@ static RPCHelpMan upgradewallet()
if (!request.params[0].isNull()) {
version = request.params[0].get_int();
}
-
bilingual_str error;
- std::vector<bilingual_str> warnings;
- if (!pwallet->UpgradeWallet(version, error, warnings)) {
+ if (!pwallet->UpgradeWallet(version, error)) {
throw JSONRPCError(RPC_WALLET_ERROR, error.original);
}
UniValue obj(UniValue::VOBJ);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e1f34fbcf9..f757f89fef 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -4122,7 +4122,7 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest
return &address_book_it->second;
}
-bool CWallet::UpgradeWallet(int version, bilingual_str& error, std::vector<bilingual_str>& warnings)
+bool CWallet::UpgradeWallet(int version, bilingual_str& error)
{
int prev_version = GetVersion();
int nMaxVersion = version;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 00e0e3c84d..acd0e7937f 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1201,7 +1201,7 @@ public:
};
/** Upgrade the wallet */
- bool UpgradeWallet(int version, bilingual_str& error, std::vector<bilingual_str>& warnings);
+ bool UpgradeWallet(int version, bilingual_str& error);
//! Returns all unique ScriptPubKeyMans in m_internal_spk_managers and m_external_spk_managers
std::set<ScriptPubKeyMan*> GetActiveScriptPubKeyMans() const;