bitcoin/bitcoin
1
1
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-05-17 23:56:39 +00:00
Code Issues Releases Activity

Merge #20139: Wallet: do not return warnings from UpgradeWallet()

Browse Source 
963696288955dc31b3a4fd136bfb791a9d99755b [upgradewallet] removed unused warning param (Sishir Giri)

Pull request description:

  The `warning` variable was unused in `upgradewallet` so I removed it

ACKs for top commit:
  practicalswift:
    ACK 963696288955dc31b3a4fd136bfb791a9d99755b: diff looks correct
  MarcoFalke:
    review ACK 963696288955dc31b3a4fd136bfb791a9d99755b
  jonatack:
    ACK 963696288955dc31b3a4fd136bfb791a9d99755b

Tree-SHA512: 1d63186ce1e05e86a778340f2d7986c2cee1523de0a11cea39e8d148ac7ee26c49741dfa302b5c1cd1c8d74e67c1f9baee2763720c2d850b57da9a3fdce24565
This commit is contained in:
MarcoFalke 2020-11-17 12:43:38 +01:00
commit c463f70fb0
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/rpcwallet.cpp
View File

@ -4474,10 +4474,8 @@ static RPCHelpMan upgradewallet()
if (!request.params[0].isNull()) { if (!request.params[0].isNull()) {
version = request.params[0].get_int(); version = request.params[0].get_int();
} }
bilingual_str error; bilingual_str error;
std::vector<bilingual_str> warnings; if (!pwallet->UpgradeWallet(version, error)) {
if (!pwallet->UpgradeWallet(version, error, warnings)) {
throw JSONRPCError(RPC_WALLET_ERROR, error.original); throw JSONRPCError(RPC_WALLET_ERROR, error.original);
} }
UniValue obj(UniValue::VOBJ); UniValue obj(UniValue::VOBJ);

2
src/wallet/wallet.cpp
View File

@ -4102,7 +4102,7 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest
return &address_book_it->second; 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 prev_version = GetVersion();
if (version == 0) { if (version == 0) {

2
src/wallet/wallet.h
View File

@ -1195,7 +1195,7 @@ public:
}; };
/** Upgrade the wallet */ /** 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 //! Returns all unique ScriptPubKeyMans in m_internal_spk_managers and m_external_spk_managers
std::set<ScriptPubKeyMan*> GetActiveScriptPubKeyMans() const; std::set<ScriptPubKeyMan*> GetActiveScriptPubKeyMans() const;