zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use DEFAULT_BLOCKSONLY and DEFAULT_WHITELISTALWAYSRELAY constants

This commit is contained in:
Patick Strateman 2015-11-14 05:10:59 -08:00 committed by Jack Grigg
parent 7e6ef59248
commit 92f952e265
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@ -932,7 +932,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
}
// disable walletbroadcast in blocksonly mode
if (GetBoolArg("-blocksonly", false)) {
if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
if (SoftSetBoolArg("-whitelistalwaysrelay", false))
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistalwaysrelay=0\n", __func__);
#ifdef ENABLE_WALLET

2
src/main.cpp
View File

@ -5891,7 +5891,7 @@ bool static ProcessMessage(const CChainParams& chainparams, CNode* pfrom, string
LogPrint("net", "getheaders (%d) %s to peer=%d\n", pindexBestHeader->nHeight, inv.hash.ToString(), pfrom->id);
}
} else {
if (!fAlreadyHave && !IsInitialBlockDownload(chainparams.GetConsensus()) && !GetBoolArg("-blocksonly", false))
if (!fAlreadyHave && !IsInitialBlockDownload(chainparams.GetConsensus()) && !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY))
pfrom->AskFor(inv);
}

2
src/net.cpp
View File

@ -466,7 +466,7 @@ void CNode::PushVersion()
else
LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
PushMessage("version", PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", false));
nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY));
}