diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-10 07:33:06 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-10 07:51:27 +0200 |
| commit | 48265f3cf4e62b6c6267b3e67c71a8780f2e2cc1 (patch) | |
| tree | daa0570926fca8f4eeedb9dc0f1f2fbddd4146b1 /src/miner.h | |
| parent | 4ac79f99b02e1d288dda353c15f4183180e538df (diff) | |
| download | bitcoin-48265f3cf4e62b6c6267b3e67c71a8780f2e2cc1.tar.xz | |
Revert mining changes in #5957
This reverts commit e2edf95cd3f43331843676e49a82830128a95050 6b04508e37c5dd18cec1cd61cc4356bd208aa991 0df67f1f7ab4adfe9f0b3ba6276e737b37826464,
except the changes to the RPC tests.
A `generate` RPC call is introduced based on the old code.
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/miner.h b/src/miner.h index 00ad299512..5d5c9c86c7 100644 --- a/src/miner.h +++ b/src/miner.h @@ -24,11 +24,9 @@ struct CBlockTemplate /** Run the miner threads */ void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads); -/** Create a single block */ -bool MineBlock(CWallet *pwallet, uint256& hash); /** Generate a new block, without valid proof-of-work */ -CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CBlockIndex*& pindexPrev); -CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey, CBlockIndex*& pindexPrev); +CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn); +CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey); /** Modify the extranonce in a block */ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev); |