Skip to content

Commit c463f70

Browse files
author
MarcoFalke
committed
Merge bitcoin#20139: Wallet: do not return warnings from UpgradeWallet()
9636962 [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 9636962: diff looks correct MarcoFalke: review ACK 9636962 jonatack: ACK 9636962 Tree-SHA512: 1d63186ce1e05e86a778340f2d7986c2cee1523de0a11cea39e8d148ac7ee26c49741dfa302b5c1cd1c8d74e67c1f9baee2763720c2d850b57da9a3fdce24565
2 parents 3457054 + 9636962 commit c463f70

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/wallet/rpcwallet.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4474,10 +4474,8 @@ static RPCHelpMan upgradewallet()
44744474
if (!request.params[0].isNull()) {
44754475
version = request.params[0].get_int();
44764476
}
4477-
44784477
bilingual_str error;
4479-
std::vector<bilingual_str> warnings;
4480-
if (!pwallet->UpgradeWallet(version, error, warnings)) {
4478+
if (!pwallet->UpgradeWallet(version, error)) {
44814479
throw JSONRPCError(RPC_WALLET_ERROR, error.original);
44824480
}
44834481
UniValue obj(UniValue::VOBJ);

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4102,7 +4102,7 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest
41024102
return &address_book_it->second;
41034103
}
41044104

4105-
bool CWallet::UpgradeWallet(int version, bilingual_str& error, std::vector<bilingual_str>& warnings)
4105+
bool CWallet::UpgradeWallet(int version, bilingual_str& error)
41064106
{
41074107
int prev_version = GetVersion();
41084108
if (version == 0) {

src/wallet/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
11951195
};
11961196

11971197
/** Upgrade the wallet */
1198-
bool UpgradeWallet(int version, bilingual_str& error, std::vector<bilingual_str>& warnings);
1198+
bool UpgradeWallet(int version, bilingual_str& error);
11991199

12001200
//! Returns all unique ScriptPubKeyMans in m_internal_spk_managers and m_external_spk_managers
12011201
std::set<ScriptPubKeyMan*> GetActiveScriptPubKeyMans() const;

0 commit comments

Comments
 (0)