diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-11-17 12:43:38 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-17 12:43:43 +0100 |
commit | c463f70fb05ed45cfcc609324078a0ccb08c7f06 (patch) | |
tree | 7276e293f46bf5ec2dc5d779344e34a5bc89dc95 /src/wallet/wallet.cpp | |
parent | 3457054c61d5b74800797e2c26a8126a21352382 (diff) | |
parent | 963696288955dc31b3a4fd136bfb791a9d99755b (diff) | |
download | bitcoin-c463f70fb05ed45cfcc609324078a0ccb08c7f06.tar.xz |
Merge #20139: Wallet: do not return warnings from UpgradeWallet()
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
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d414555511..3ce8272fb9 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4102,7 +4102,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(); if (version == 0) { |