Remove ChainParams::DefaultMinerThreads

laanwj · laanwj · commit 6ebac0782f92 · 2015-07-03T16:46:20.000+02:00
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.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -50,7 +50,6 @@ class CMainParams : public CChainParams {
         pchMessageStart[3] = 0xd9;
         vAlertPubKey = ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284");
         nDefaultPort = 8333;
-        nMinerThreads = 0;
         nPruneAfterHeight = 100000;
 
         /**
@@ -147,7 +146,6 @@ class CTestNetParams : public CMainParams {
         pchMessageStart[3] = 0x07;
         vAlertPubKey = ParseHex("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a");
         nDefaultPort = 18333;
-        nMinerThreads = 0;
         nPruneAfterHeight = 1000;
 
         //! Modify the testnet genesis block so the timestamp is valid for a later start.
@@ -206,7 +204,6 @@ class CRegTestParams : public CTestNetParams {
         pchMessageStart[1] = 0xbf;
         pchMessageStart[2] = 0xb5;
         pchMessageStart[3] = 0xda;
-        nMinerThreads = 1;
         genesis.nTime = 1296688602;
         genesis.nBits = 0x207fffff;
         genesis.nNonce = 2;
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -50,8 +50,6 @@ class CChainParams
     const std::vector<unsigned char>& AlertKey() const { return vAlertPubKey; }
     int GetDefaultPort() const { return nDefaultPort; }
 
-    /** Used if GenerateBitcoins is called with a negative number of threads */
-    int DefaultMinerThreads() const { return nMinerThreads; }
     const CBlock& GenesisBlock() const { return genesis; }
     bool RequireRPCPassword() const { return fRequireRPCPassword; }
     /** Make miner wait to have peers to avoid wasting work */
@@ -79,7 +77,6 @@ class CChainParams
     //! Raw pub key bytes for the broadcast alert signing key.
     std::vector<unsigned char> vAlertPubKey;
     int nDefaultPort;
-    int nMinerThreads;
     uint64_t nPruneAfterHeight;
     std::vector<CDNSSeedData> vSeeds;
     std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
diff --git 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)
     {

Original file line number	Diff line number	Diff line change
`@@ -541,13 +541,8 @@ void GenerateBitcoins(bool fGenerate, int nThreads, const CChainParams& chainpar`
`541`	`541`	`{`
`542`	`542`	`static boost::thread_group* minerThreads = NULL;`
`543`	`543`
`544`		`- if (nThreads < 0) {`
`545`		`- // In regtest threads defaults to 1`
`546`		`- if (Params().DefaultMinerThreads())`
`547`		`- nThreads = Params().DefaultMinerThreads();`
`548`		`- else`
`549`		`- nThreads = GetNumCores();`
`550`		`- }`
	`544`	`+ if (nThreads < 0)`
	`545`	`+ nThreads = GetNumCores();`
`551`	`546`
`552`	`547`	`if (minerThreads != NULL)`
`553`	`548`	`{`