diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-30 11:34:05 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-30 11:34:09 +0100 |
| commit | 9ebedc1756e301e99bd11cc7a43ed705239f86e3 (patch) | |
| tree | a4e9c6c9df47cad976e07ab9a37d126ab3d2329a /src | |
| parent | 74b5ce24c6a450c0a57048b012dd15b182e981a9 (diff) | |
| parent | fa4b6272695d282638f07191e634aaeeb91a6be7 (diff) | |
| download | bitcoin-9ebedc1756e301e99bd11cc7a43ed705239f86e3.tar.xz | |
Merge pull request #7126
fa4b627 Move blocksonly parameter interaction to InitParameterInteraction() (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/init.cpp b/src/init.cpp index 1c2f3f49d4..191c2ed8ae 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -820,7 +820,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) // ********************************************************* Step 2: parameter interactions const CChainParams& chainparams = Params(); - + // also see: InitParameterInteraction() // if using block pruning, then disable txindex if (GetArg("-prune", 0)) { @@ -833,16 +833,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) #endif } - // disable walletbroadcast and whitelistalwaysrelay in blocksonly mode - if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) { - if (SoftSetBoolArg("-whitelistalwaysrelay", false)) - LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistalwaysrelay=0\n", __func__); -#ifdef ENABLE_WALLET - if (SoftSetBoolArg("-walletbroadcast", false)) - LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__); -#endif - } - // Make sure enough file descriptors are available int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1); int nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS); |