[Pkg-bitcoin-commits] [bitcoin] 101/126: Stop always storing blocks from whitelisted peers

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.15.1_dfsg-1
in repository bitcoin.

commit c6e4d0ce82cfd9fb775ba5ca5874af207585837b
Author: Matt Corallo <git at bluematt.me>
Date:   Wed Oct 11 16:01:51 2017 -0400

    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.
    
    Github-Pull: #11531
    Rebased-From: 3d9c70ca0fd5d42f31114b689714af1825f0ed30
---
 src/net_processing.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 69db5d7..0697c6b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2509,11 +2509,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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/bitcoin.git