diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-11 15:06:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-11 15:13:05 +0100 |
| commit | e564e63ef04e55b1e446f8440d51c611bc41cec6 (patch) | |
| tree | 2d82b4c9e378cffcd0fb23c75126086df4d07503 /src/main.cpp | |
| parent | d734d87b28ccbf2a4a4eb19a28285b5dea782105 (diff) | |
| parent | 3aa0130b963087025b64108225bbadea36d8c6df (diff) | |
| download | bitcoin-e564e63ef04e55b1e446f8440d51c611bc41cec6.tar.xz | |
Merge pull request #5871
3aa0130 test: remove fSkipProofOfWork (Wladimir J. van der Laan)
59bd89f test: Remove UNITTEST params (Wladimir J. van der Laan)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index e16887fa4a..6bbb3bc135 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2596,8 +2596,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta int nHeight = pindexPrev->nHeight+1; // Check proof of work - if ((!Params().SkipProofOfWorkCheck()) && - (block.nBits != GetNextWorkRequired(pindexPrev, &block))) + if ((block.nBits != GetNextWorkRequired(pindexPrev, &block))) return state.DoS(100, error("%s: incorrect proof of work", __func__), REJECT_INVALID, "bad-diffbits"); |