diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-11-21 14:07:55 +1000 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-11-22 09:51:13 +1000 |
| commit | c8b74258bad399d39262ed11b892a729196cb297 (patch) | |
| tree | b91c7296f6d8ecde1c0297d57a68ecc8dc257ce2 /src/miner.cpp | |
| parent | 34f5b0ab93e4f92e92531afa090caba06a031c68 (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.cpp')
| -rw-r--r-- | src/miner.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 97f434851d..b01b60cc34 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -650,11 +650,10 @@ void static BitcoinMiner(CWallet *pwallet) } } -void GenerateBitcoins(bool fGenerate, CWallet* pwallet) +void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads) { static boost::thread_group* minerThreads = NULL; - int nThreads = GetArg("-genproclimit", -1); if (nThreads < 0) { if (Params().NetworkID() == CChainParams::REGTEST) nThreads = 1; |