diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-02-03 13:23:46 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-02-03 13:23:49 +0100 |
| commit | eb331794a22b86da0a76d6710cb3eb37903a486e (patch) | |
| tree | f88f17095a20c17d25f5c4bdc7e9cb1f28046961 /src/main.cpp | |
| parent | Merge #7444: Improve block validity/ConnectBlock() comments (diff) | |
| parent | Eliminate unnecessary call to CheckBlock (diff) | |
| download | discoin-eb331794a22b86da0a76d6710cb3eb37903a486e.tar.xz discoin-eb331794a22b86da0a76d6710cb3eb37903a486e.zip | |
Merge #7225: Eliminate unnecessary call to CheckBlock
dbb89dc Eliminate unnecessary call to CheckBlock (Suhas Daftuar)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp index b165366dd..984523408 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; |