diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-23 07:17:47 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-23 07:18:24 +0100 |
| commit | 40022fe5f2b576d023fa260eb176bde6d0779330 (patch) | |
| tree | 196cf75e2927ec2148f69cc42065f42e6b83481c /src/init.cpp | |
| parent | 4d8558a2871ec70b9d09028c49fa39e4911435f5 (diff) | |
| parent | 2e448930815074bbb07214604ed16e905f68558d (diff) | |
| download | bitcoin-40022fe5f2b576d023fa260eb176bde6d0779330.tar.xz | |
Merge #9142: Move -salvagewallet, -zap(wtx) to where they belong
2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/init.cpp b/src/init.cpp index b5606069e1..ca5437fb91 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -751,23 +751,10 @@ void InitParameterInteraction() LogPrintf("%s: parameter interaction: -externalip set -> setting -discover=0\n", __func__); } - if (GetBoolArg("-salvagewallet", false)) { - // Rewrite just private keys: rescan to find transactions - if (SoftSetBoolArg("-rescan", true)) - LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__); - } - - // -zapwallettx implies a rescan - if (GetBoolArg("-zapwallettxes", false)) { - if (SoftSetBoolArg("-rescan", true)) - LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__); - } - - // disable walletbroadcast and whitelistrelay in blocksonly mode + // disable whitelistrelay in blocksonly mode if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) { if (SoftSetBoolArg("-whitelistrelay", false)) LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistrelay=0\n", __func__); - // walletbroadcast is disabled in CWallet::ParameterInteraction() } // Forcing relay from whitelisted hosts implies we will accept relays from them in the first place. |