aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorSergioDemianLerner <Sergio.d.Lerner@gmail.com>2014-09-04 16:23:42 -0300
committerWladimir J. van der Laan <laanwj@gmail.com>2014-09-29 13:03:22 +0200
commita25fd6be138ff2bff7e2ad6a1a789db523c0193f (patch)
tree331eae7469995c3a8318df70f1654c7116fd1bd4 /src/main.cpp
parent41150d601df8bbbec9e6f0b7fb4d3fc569692522 (diff)
downloadbitcoin-a25fd6be138ff2bff7e2ad6a1a789db523c0193f.tar.xz
Switch testing framework from MAIN to new UNITTEST network
UNITTEST inherites from MAIN but allows synamically changing its parameters using the ModifiableParams() interface
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 9a4271eda2..4bd8fd6e36 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2304,6 +2304,7 @@ bool AcceptBlockHeader(CBlockHeader& block, CValidationState& state, CBlockIndex
nHeight = pindexPrev->nHeight+1;
// Check proof of work
+ if (!Params().SkipProofOfWorkCheck())
if (block.nBits != GetNextWorkRequired(pindexPrev, &block))
return state.DoS(100, error("AcceptBlock() : incorrect proof of work"),
REJECT_INVALID, "bad-diffbits");