diff options
| author | MarcoFalke <[email protected]> | 2020-04-21 18:55:20 -0400 |
|---|---|---|
| committer | Andrew Chow <[email protected]> | 2020-11-04 12:16:57 -0500 |
| commit | 5f9c0b6360215636cfa62a70d3a70f1feb3977ab (patch) | |
| tree | 07ba8b0642de2f84c2f036bfe31d2f3ac5687216 /src | |
| parent | test: Remove unused wallet.dat (diff) | |
| download | discoin-5f9c0b6360215636cfa62a70d3a70f1feb3977ab.tar.xz discoin-5f9c0b6360215636cfa62a70d3a70f1feb3977ab.zip | |
wallet: Remove -upgradewallet from dummywallet
Diffstat (limited to 'src')
| -rw-r--r-- | src/dummywallet.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp index 8d2dcd027..4543f098a 100644 --- a/src/dummywallet.cpp +++ b/src/dummywallet.cpp @@ -40,7 +40,6 @@ void DummyWalletInit::AddWalletOptions(ArgsManager& argsman) const "-salvagewallet", "-spendzeroconfchange", "-txconfirmtarget=<n>", - "-upgradewallet", "-wallet=<path>", "-walletbroadcast", "-walletdir=<dir>", diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index be7b30009..11ce0d0c0 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4100,8 +4100,7 @@ const CAddressBookData* CWallet::FindAddressBookEntry(const CTxDestination& dest bool CWallet::UpgradeWallet(int version, bilingual_str& error, std::vector<bilingual_str>& warnings) { int prev_version = GetVersion(); - if (version == 0) // the -upgradewallet without argument case - { + if (version == 0) { WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST); version = FEATURE_LATEST; } else { |