aboutsummaryrefslogtreecommitdiff
path: root/src/miner.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-11-21 14:07:55 +1000
committerGavin Andresen <gavinandresen@gmail.com>2013-11-22 09:51:13 +1000
commitc8b74258bad399d39262ed11b892a729196cb297 (patch)
treeb91c7296f6d8ecde1c0297d57a68ecc8dc257ce2 /src/miner.h
parent34f5b0ab93e4f92e92531afa090caba06a031c68 (diff)
setgenerate creates multiple blocks in -regtest mode
I'm writing some wallet regression tests using -regtest mode, and need to generate an initial multi-hundred-block chain. Repeatedly calling setgenerate to generate one block is slow and doesn't work properly, because block creation happens asynchronously. This adds two features to setgenerate in -regtest mode: 1) Instead of being interpreted as number of threads to start, the third argument is the number of blocks to generate. 2) setgenerate will not return until the block creation threads have created the requested number of blocks.
Diffstat (limited to 'src/miner.h')
-rw-r--r--src/miner.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.h b/src/miner.h
index 4879f55d51..26151f6cd5 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -16,7 +16,7 @@ class CScript;
class CWallet;
/** Run the miner threads */
-void GenerateBitcoins(bool fGenerate, CWallet* pwallet);
+void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads);
/** Generate a new block, without valid proof-of-work */
CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn);
CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey);