diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2015-11-10 19:28:56 +0100 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2015-11-11 01:33:39 +0100 |
| commit | 726784374520347f09372532bd89156cdfd950f2 (patch) | |
| tree | a9b4396a9eac8218a10c5f3c1edcb886a3538e23 /src | |
| parent | 77beab70deae8ad821cc069c1ce80fc809c89c33 (diff) | |
| download | bitcoin-726784374520347f09372532bd89156cdfd950f2.tar.xz | |
Globals: Make AcceptBlockHeader static (Fix #6163)
..and at the same time prevent AcceptBlockHeader() from calling global function Params()
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 7 | ||||
| -rw-r--r-- | src/main.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index bc49d09fe7..cfac2fcc1f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2781,9 +2781,8 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn return true; } -bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, CBlockIndex** ppindex) +static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex=NULL) { - const CChainParams& chainparams = Params(); AssertLockHeld(cs_main); // Check for duplicate uint256 hash = block.GetHash(); @@ -2836,7 +2835,7 @@ bool AcceptBlock(const CBlock& block, CValidationState& state, CBlockIndex** ppi CBlockIndex *&pindex = *ppindex; - if (!AcceptBlockHeader(block, state, &pindex)) + if (!AcceptBlockHeader(block, state, chainparams, &pindex)) return false; // Try to process all requested blocks that we don't have, but only @@ -4498,7 +4497,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, Misbehaving(pfrom->GetId(), 20); return error("non-continuous headers sequence"); } - if (!AcceptBlockHeader(header, state, &pindexLast)) { + if (!AcceptBlockHeader(header, state, chainparams, &pindexLast)) { int nDoS; if (state.IsInvalid(nDoS)) { if (nDoS > 0) diff --git a/src/main.h b/src/main.h index c7dad10ca3..689743d56a 100644 --- a/src/main.h +++ b/src/main.h @@ -380,7 +380,6 @@ bool TestBlockValidity(CValidationState &state, const CBlock& block, CBlockIndex /** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */ bool AcceptBlock(const CBlock& block, CValidationState& state, CBlockIndex **pindex, bool fRequested, CDiskBlockPos* dbp); -bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex **ppindex= NULL); class CBlockFileInfo |