diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-02 10:27:36 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-02 10:39:55 +0200 |
| commit | 8d132431b4f6a7676482815231cd923d9047d541 (patch) | |
| tree | c3d7a2dbb2868954748761161896cc8f02b940b1 /src/main.cpp | |
| parent | ad51e14583fbf6d53d5a2b22a0a0dbe4a51a9a7d (diff) | |
| download | bitcoin-8d132431b4f6a7676482815231cd923d9047d541.tar.xz | |
Revert merge of pull #4845
It breaks the new mingw tests!
See
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845581
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845582
This reverts commit 470590277782cce2fe73275c74523aef59a51eab, 5e2e7fcb99738d9254d4030d53e4f711b2fc5ee0, a25fd6be138ff2bff7e2ad6a1a789db523c0193f.
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 55485c86ff..a3e36ff872 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2305,8 +2305,7 @@ bool AcceptBlockHeader(CBlockHeader& block, CValidationState& state, CBlockIndex 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("AcceptBlock() : incorrect proof of work"), REJECT_INVALID, "bad-diffbits"); |