diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-14 11:35:11 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-14 11:35:41 +0100 |
| commit | 11c769966ad73dd169abe39ec4ef5ae70119e1a5 (patch) | |
| tree | 06cbda48c6bf8ba83e34cf180ba2b4c2dd9fa6c7 /src/init.cpp | |
| parent | 5b3b5a7d711cb509b0115b85abca8e9ea079d737 (diff) | |
| parent | 8d1de43f0cbc79940d870d0ba09c7d28dd812ef8 (diff) | |
| download | bitcoin-11c769966ad73dd169abe39ec4ef5ae70119e1a5.tar.xz | |
Merge #7507: Remove internal miner
8d1de43 Remove internal miner (Leviathn)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp index ba98600141..637b69ab05 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -195,7 +195,6 @@ void Shutdown() if (pwalletMain) pwalletMain->Flush(false); #endif - GenerateBitcoins(false, 0, Params()); StopNode(); StopTorControl(); UnregisterNodeSignals(GetNodeSignals()); @@ -429,8 +428,6 @@ std::string HelpMessage(HelpMessageMode mode) _("If <category> is not supplied or if <category> = 1, output all debugging information.") + _("<category> can be:") + " " + debugCategories + "."); if (showDebug) strUsage += HelpMessageOpt("-nodebug", "Turn off debugging messages, same as -debug=0"); - strUsage += HelpMessageOpt("-gen", strprintf(_("Generate coins (default: %u)"), DEFAULT_GENERATE)); - strUsage += HelpMessageOpt("-genproclimit=<n>", strprintf(_("Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)"), DEFAULT_GENERATE_THREADS)); strUsage += HelpMessageOpt("-help-debug", _("Show all debugging options (usage: --help -help-debug)")); strUsage += HelpMessageOpt("-logips", strprintf(_("Include IP addresses in debug output (default: %u)"), DEFAULT_LOGIPS)); strUsage += HelpMessageOpt("-logtimestamps", strprintf(_("Prepend debug output with timestamp (default: %u)"), DEFAULT_LOGTIMESTAMPS)); @@ -1508,9 +1505,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) boost::ref(cs_main), boost::cref(pindexBestHeader), nPowTargetSpacing); scheduler.scheduleEvery(f, nPowTargetSpacing); - // Generate coins in the background - GenerateBitcoins(GetBoolArg("-gen", DEFAULT_GENERATE), GetArg("-genproclimit", DEFAULT_GENERATE_THREADS), chainparams); - // ********************************************************* Step 12: finished SetRPCWarmupFinished(); |