aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2017-10-11 16:01:51 -0400
committerMatt Corallo <git@bluematt.me>2017-10-31 13:36:06 -0400
commit3d9c70ca0fd5d42f31114b689714af1825f0ed30 (patch)
tree4eaa24c761798416ad83ab0aac95b1e3f0a5c75d /src
parent3b4ac43bc371561b5fa559bccb17dc0702bd4b69 (diff)
downloadbitcoin-3d9c70ca0fd5d42f31114b689714af1825f0ed30.tar.xz
Stop always storing blocks from whitelisted peers
There is no reason to wish to store blocks on disk always just because a peer is whitelisted. This appears to be a historical quirk to avoid breaking things when the accept limits were added.
Diffstat (limited to 'src')
-rw-r--r--src/net_processing.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 50ac76924b..c093d1d57f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2480,11 +2480,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
LogPrint(BCLog::NET, "received block %s peer=%d\n", pblock->GetHash().ToString(), pfrom->GetId());
- // Process all blocks from whitelisted peers, even if not requested,
- // unless we're still syncing with the network.
- // Such an unrequested block may still be processed, subject to the
- // conditions in AcceptBlock().
- bool forceProcessing = pfrom->fWhitelisted && !IsInitialBlockDownload();
+ bool forceProcessing = false;
const uint256 hash(pblock->GetHash());
{
LOCK(cs_main);