diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-03 09:13:56 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-03 16:46:20 +0200 |
| commit | 6ebac0782f9201e86d507fe7fff71f2c35680682 (patch) | |
| tree | 61d4dd807335ed0b9fdefe3e2620341bfc259403 /src/miner.cpp | |
| parent | d0a10c1959176eb40c0ec47a56de00820c59066d (diff) | |
| download | bitcoin-6ebac0782f9201e86d507fe7fff71f2c35680682.tar.xz | |
Remove ChainParams::DefaultMinerThreads
No longer relevant after #5957. This hack existed because of another
hack where the numthreads parameter, on regtest, doubled as how many
blocks to generate.
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index ca32e9f7b3..d3f5094fe9 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -541,13 +541,8 @@ void GenerateBitcoins(bool fGenerate, int nThreads, const CChainParams& chainpar { static boost::thread_group* minerThreads = NULL; - if (nThreads < 0) { - // In regtest threads defaults to 1 - if (Params().DefaultMinerThreads()) - nThreads = Params().DefaultMinerThreads(); - else - nThreads = GetNumCores(); - } + if (nThreads < 0) + nThreads = GetNumCores(); if (minerThreads != NULL) { |