Add MiningRequiresPeers chain parameter

jtimon · jtimon · commit 1712adbe0b08 · 2014-06-04T13:29:35.000+02:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -246,6 +246,7 @@ class CRegTestParams : public CTestNetParams {
     }
 
     virtual bool RequireRPCPassword() const { return false; }
+    virtual bool MiningRequiresPeers() const { return false; }
     virtual Network NetworkID() const { return CChainParams::REGTEST; }
 };
 static CRegTestParams regTestParams;
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -59,6 +59,8 @@ class CChainParams
     int SubsidyHalvingInterval() const { return nSubsidyHalvingInterval; }
     virtual const CBlock& GenesisBlock() const = 0;
     virtual bool RequireRPCPassword() const { return true; }
+    /* Make miner wait to have peers to avoid wasting work */
+    virtual bool MiningRequiresPeers() const { return true; }
     const string& DataDir() const { return strDataDir; }
     virtual Network NetworkID() const = 0;
     const vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -512,7 +512,7 @@ void static BitcoinMiner(CWallet *pwallet)
     unsigned int nExtraNonce = 0;
 
     try { while (true) {
-        if (Params().NetworkID() != CChainParams::REGTEST) {
+        if (Params().MiningRequiresPeers()) {
             // Busy-wait for the network to come online so we don't waste time mining
             // on an obsolete chain. In regtest mode we expect to fly solo.
             while (vNodes.empty())
@@ -620,7 +620,8 @@ void static BitcoinMiner(CWallet *pwallet)
 
             // Check for stop or if block needs to be rebuilt
             boost::this_thread::interruption_point();
-            if (vNodes.empty() && Params().NetworkID() != CChainParams::REGTEST)
+            // Regtest mode doesn't require peers
+            if (vNodes.empty() && Params().MiningRequiresPeers())
                 break;
             if (nBlockNonce >= 0xffff0000)
                 break;

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ class CRegTestParams : public CTestNetParams {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`virtual bool RequireRPCPassword() const { return false; }`
	`249`	`+ virtual bool MiningRequiresPeers() const { return false; }`
`249`	`250`	`virtual Network NetworkID() const { return CChainParams::REGTEST; }`
`250`	`251`	`};`
`251`	`252`	`static CRegTestParams regTestParams;`