aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-02-03 13:23:46 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-02-03 13:23:49 +0100
commiteb331794a22b86da0a76d6710cb3eb37903a486e (patch)
treef88f17095a20c17d25f5c4bdc7e9cb1f28046961 /src
parent4cdbd4255b94bbccb2be8ec702dfe94b11d15b70 (diff)
parentdbb89dc793b0fc19a0d0ac5c4ef08cc2760b06bf (diff)
Merge #7225: Eliminate unnecessary call to CheckBlock
dbb89dc Eliminate unnecessary call to CheckBlock (Suhas Daftuar)
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b165366ddc..9845234084 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3169,16 +3169,10 @@ static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned
bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, CDiskBlockPos* dbp)
{
- // Preliminary checks
- bool checked = CheckBlock(*pblock, state);
-
{
LOCK(cs_main);
bool fRequested = MarkBlockAsReceived(pblock->GetHash());
fRequested |= fForceProcessing;
- if (!checked) {
- return error("%s: CheckBlock FAILED %s", __func__, FormatStateMessage(state));
- }
// Store to disk
CBlockIndex *pindex = NULL;