diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 14:29:12 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 14:33:22 +0100 |
| commit | f2ada138c28bf6b4f4a668c4ab60b55d124c9823 (patch) | |
| tree | a8266e2f901e69384ceef9b305d23944e713d599 /src/pow.h | |
| parent | ca6fb4e885c899e297e0a6fa723604a41f199aa6 (diff) | |
| parent | 092b58d13d658baebbf03a6d5209f368f19e50a8 (diff) | |
Merge pull request #5170
092b58d CBlockIndex::GetBlockWork() + GetProofIncrement(nBits) -> GetBlockProof(CBlockIndex) (jtimon)
22c4272 MOVEONLY: Move void UpdateTime() from pow.o to miner.o (plus fix include main.h -> chain.h) (jtimon)
Diffstat (limited to 'src/pow.h')
| -rw-r--r-- | src/pow.h | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -16,9 +16,6 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead /** Check whether a block hash satisfies the proof-of-work requirement specified by nBits */ bool CheckProofOfWork(uint256 hash, unsigned int nBits); - -void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev); - -uint256 GetProofIncrement(unsigned int nBits); +uint256 GetBlockProof(const CBlockIndex& block); #endif // BITCOIN_POW_H |