Browse Source

Merge #7225: Eliminate unnecessary call to CheckBlock

dbb89dc Eliminate unnecessary call to CheckBlock (Suhas Daftuar)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
eb331794a2
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 6
      src/main.cpp

6
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) 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); LOCK(cs_main);
bool fRequested = MarkBlockAsReceived(pblock->GetHash()); bool fRequested = MarkBlockAsReceived(pblock->GetHash());
fRequested |= fForceProcessing; fRequested |= fForceProcessing;
if (!checked) {
return error("%s: CheckBlock FAILED %s", __func__, FormatStateMessage(state));
}
// Store to disk // Store to disk
CBlockIndex *pindex = NULL; CBlockIndex *pindex = NULL;

Loading…
Cancel
Save