From 963696288955dc31b3a4fd136bfb791a9d99755b Mon Sep 17 00:00:00 2001 From: Sishir Giri Date: Mon, 12 Oct 2020 14:05:24 -0700 Subject: [PATCH] [upgradewallet] removed unused warning param --- src/wallet/rpcwallet.cpp | 4 +--- src/wallet/wallet.cpp | 2 +- src/wallet/wallet.h | 2 +- 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 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& 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 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati }; /** Upgrade the wallet */ - bool UpgradeWallet(int version, bilingual_str& error, std::vector& warnings); + bool UpgradeWallet(int version, bilingual_str& error); //! Returns all unique ScriptPubKeyMans in m_internal_spk_managers and m_external_spk_managers std::set GetActiveScriptPubKeyMans() const;