diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-14 10:37:15 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-14 10:38:27 +0100 |
| commit | 1b046603b30ebfab6199a2f92015d507b248b590 (patch) | |
| tree | 90de4ab043e222a976d73f4d783f04682b0f0f4b /src/pow.cpp | |
| parent | 857d1e171e051b254a617f27b39f6a551054cee2 (diff) | |
| parent | 4d51e9be165d860fac0eb6aff9931092605ccd1f (diff) | |
| download | bitcoin-1b046603b30ebfab6199a2f92015d507b248b590.tar.xz | |
Merge #8665: Assert all the things!
4d51e9b Assert ConnectBlock block and pIndex are the same block (NicolasDorier)
972714c pow: GetNextWorkRequired never called with NULL pindexLast (Daniel Cousens)
cc44c8f ContextualCheckBlockHeader should never have pindexPrev to NULL (NicolasDorier)
Tree-SHA512: 7cc568bf9417267c335f21ec3d1505b26e56e5b3d5f4d3dbb555279489800aaa65a3bcd7bc376e274dd102912aec16ddbb18de2e2060b2667b41eb979cd9321e
Diffstat (limited to 'src/pow.cpp')
| -rw-r--r-- | src/pow.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/pow.cpp b/src/pow.cpp index e57fd866f8..e06d9662e6 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -12,12 +12,9 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params) { + assert(pindexLast != NULL); unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact(); - // Genesis block - if (pindexLast == NULL) - return nProofOfWorkLimit; - // Only change once per difficulty adjustment interval if ((pindexLast->nHeight+1) % params.DifficultyAdjustmentInterval() != 0) { |