aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/load.cpp
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2020-05-08 17:10:59 -0400
committerAndrew Chow <achow101-github@achow101.com>2020-05-25 12:39:40 -0400
commitd321046f4bb4887742699c586755a21f3a2edbe1 (patch)
tree983706f8795aa6e503103d11bc73e0cf11271e8d /src/wallet/load.cpp
parentcdd955e580dff99f3fa440494ed2b348f7f094af (diff)
downloadbitcoin-d321046f4bb4887742699c586755a21f3a2edbe1.tar.xz
wallet: remove -salvagewallet
Diffstat (limited to 'src/wallet/load.cpp')
-rw-r--r--src/wallet/load.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp
index 16f3699d37..8df3e78215 100644
--- a/src/wallet/load.cpp
+++ b/src/wallet/load.cpp
@@ -37,11 +37,6 @@ bool VerifyWallets(interfaces::Chain& chain, const std::vector<std::string>& wal
chain.initMessage(_("Verifying wallet(s)...").translated);
- // Parameter interaction code should have thrown an error if -salvagewallet
- // was enabled with more than wallet file, so the wallet_files size check
- // here should have no effect.
- bool salvage_wallet = gArgs.GetBoolArg("-salvagewallet", false) && wallet_files.size() <= 1;
-
// Keep track of each wallet absolute path to detect duplicates.
std::set<fs::path> wallet_paths;
@@ -55,7 +50,7 @@ bool VerifyWallets(interfaces::Chain& chain, const std::vector<std::string>& wal
bilingual_str error_string;
std::vector<bilingual_str> warnings;
- bool verify_success = CWallet::Verify(chain, location, salvage_wallet, error_string, warnings);
+ bool verify_success = CWallet::Verify(chain, location, error_string, warnings);
if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n")));
if (!verify_success) {
chain.initError(error_string);