diff options
| author | jtimon <[email protected]> | 2014-07-07 07:40:40 +0200 |
|---|---|---|
| committer | jtimon <[email protected]> | 2014-07-30 02:26:21 +0200 |
| commit | f0c2915f66ade456c9d7847ea64fef09e1a12975 (patch) | |
| tree | fbe99aeea21e792f3ba7ed1a68231e49ade32a0f /src/miner.cpp | |
| parent | Merge branch '2014_07_remove_pyminer' of git://github.com/laanwj/bitcoin into... (diff) | |
| download | discoin-f0c2915f66ade456c9d7847ea64fef09e1a12975.tar.xz discoin-f0c2915f66ade456c9d7847ea64fef09e1a12975.zip | |
Simplify and rename CheckWork to ProcessBlockFound
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index ec56c7119..9408d2c5a 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -402,17 +402,8 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey) return CreateNewBlock(scriptPubKey); } -bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) +bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) { - uint256 hash = pblock->GetHash(); - uint256 hashTarget = uint256().SetCompact(pblock->nBits); - - if (hash > hashTarget) - return false; - - //// debug print - LogPrintf("BitcoinMiner:\n"); - LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex()); pblock->print(); LogPrintf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue)); @@ -500,7 +491,9 @@ void static BitcoinMiner(CWallet *pwallet) assert(hash == pblock->GetHash()); SetThreadPriority(THREAD_PRIORITY_NORMAL); - CheckWork(pblock, *pwallet, reservekey); + LogPrintf("BitcoinMiner:\n"); + LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex()); + ProcessBlockFound(pblock, *pwallet, reservekey); SetThreadPriority(THREAD_PRIORITY_LOWEST); // In regression test mode, stop mining after a block is found. |