diff options
| author | John Newbery <john@johnnewbery.com> | 2019-10-14 13:39:25 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-10-14 13:39:25 -0400 |
| commit | b96ed0396294fc4fa89d83ceab6bc169dd09f002 (patch) | |
| tree | 8da7d40bfa69145497b56b4755c98e5c568d27f8 /src | |
| parent | eea462de9c652dca556ad241d2126b10790f67f8 (diff) | |
| download | bitcoin-b96ed0396294fc4fa89d83ceab6bc169dd09f002.tar.xz | |
[wallet] Remove pruning check for -rescan option
Prior to this PR, the wallet would not allow the `-rescan` option at
startup if pruning was enabled. This is unnecessarily restrictive. It
should be possible to rescan if pruning is enabled, as long as no blocks
have actually been pruned yet.
Remove the pruning check from WalletInit::ParameterInteraction(). If any
blocks have been pruned, that will be caught in CreateWalletFromFile().
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/init.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 43b6ead028..b7f3f2e5fe 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -122,8 +122,6 @@ bool WalletInit::ParameterInteraction() const if (gArgs.GetBoolArg("-sysperms", false)) return InitError("-sysperms is not allowed in combination with enabled wallet functionality"); - if (gArgs.GetArg("-prune", 0) && gArgs.GetBoolArg("-rescan", false)) - return InitError(_("Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.").translated); return true; } |