diff --git a/src/miner.cpp b/src/miner.cpp index 090cf83cf..b04ff285d 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1604,28 +1604,18 @@ void static BitcoinMiner() minerThreads = NULL; } - //fprintf(stderr,"nThreads.%d fGenerate.%d\n",(int32_t)nThreads,fGenerate); - if ( ASSETCHAINS_STAKED > 0 && nThreads == 0 && fGenerate ) - { - if ( pwallet != NULL ) - nThreads = 1; - else - return; - } + fprintf(stderr,"%s: nThreads.%d fGenerate.%d\n",__FUNCTION__, (int32_t)nThreads,fGenerate); - if ((nThreads == 0 || !fGenerate) && (pwallet == NULL)) + if (nThreads == 0) + return; + if (!fGenerate) + return; + if (pwallet == NULL) return; minerThreads = new boost::thread_group(); -#ifdef ENABLE_WALLET - if (ASSETCHAINS_LWMAPOS != 0) - { - } -#endif - for (int i = 0; i < nThreads; i++) { - #ifdef ENABLE_WALLET if ( ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH ) minerThreads->create_thread(boost::bind(&BitcoinMiner, pwallet)); diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index db2fbb228..5354b7d07 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -1,5 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2019 The Hush developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -369,25 +370,11 @@ UniValue setgenerate(const UniValue& params, bool fHelp) //if (nGenProcLimit == 0) // fGenerate = false; } - if ( ASSETCHAINS_LWMAPOS != 0 ) - { - if (fGenerate && !nGenProcLimit) - { - fGenerate = GetBoolArg("-gen", false); - KOMODO_MININGTHREADS = nGenProcLimit; - } - else if (!fGenerate) - { - KOMODO_MININGTHREADS = 0; - } - else KOMODO_MININGTHREADS = (int32_t)nGenProcLimit; - } - else - { - KOMODO_MININGTHREADS = (int32_t)nGenProcLimit; - } - mapArgs["-gen"] = (fGenerate ? "1" : "0"); + KOMODO_MININGTHREADS = (int32_t)nGenProcLimit; + fprintf(stderr,"%s:KOMODO_MININGTHREADS=%d\n", __FUNCTION__, KOMODO_MININGTHREADS); + + mapArgs["-gen"] = (fGenerate ? "1" : "0"); mapArgs ["-genproclimit"] = itostr(KOMODO_MININGTHREADS); #ifdef ENABLE_WALLET