diff --git a/eth/main.cpp b/eth/main.cpp index 87fde2bdd..41036d77e 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -119,7 +119,7 @@ void help() << " -p,--port Connect to remote port (default: 30303)." << endl << " -r,--remote Connect to remote host (default: none)." << endl << " -s,--secret Set the secret key for use with send command (default: auto)." << endl - << " -t,--miners Number of mining threads to start (Default: " << thread::hardware_concurrency() << ")" << endl + << " -t,--miners Number of mining threads to start (Default: " << thread::hardware_concurrency() << ")" << endl << " -u,--public-ip Force public ip to given (default; auto)." << endl << " -v,--verbosity <0 - 9> Set the log verbosity from 0 to 9 (Default: 8)." << endl << " -x,--peers Attempt to connect to given number of peers (Default: 5)." << endl @@ -196,7 +196,7 @@ int main(int argc, char** argv) unsigned mining = ~(unsigned)0; NodeMode mode = NodeMode::Full; unsigned peers = 5; - int miners = -1; + int miners = -1; bool interactive = false; #if ETH_JSONRPC int jsonrpc = -1; @@ -297,8 +297,8 @@ int main(int argc, char** argv) g_logVerbosity = atoi(argv[++i]); else if ((arg == "-x" || arg == "--peers") && i + 1 < argc) peers = atoi(argv[++i]); - else if ((arg == "-t" || arg == "--miners") && i + 1 < argc) - miners = atoi(argv[++i]); + else if ((arg == "-t" || arg == "--miners") && i + 1 < argc) + miners = atoi(argv[++i]); else if ((arg == "-o" || arg == "--mode") && i + 1 < argc) { string m = argv[++i]; @@ -342,7 +342,7 @@ int main(int argc, char** argv) false, mode == NodeMode::Full ? set{"eth", "shh"} : set(), netPrefs, - miners + miners ); web3.setIdealPeerCount(peers); eth::Client* c = mode == NodeMode::Full ? web3.ethereum() : nullptr; diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index f36a9ba22..455cce7a8 100644 --- a/libethereum/Client.cpp +++ b/libethereum/Client.cpp @@ -69,10 +69,10 @@ Client::Client(p2p::Host* _extNet, std::string const& _dbPath, bool _forceClean, { m_host = _extNet->registerCapability(new EthereumHost(m_bc, m_tq, m_bq, _networkId)); - if(miners > -1) - setMiningThreads(miners); - else - setMiningThreads(); + if(miners > -1) + setMiningThreads(miners); + else + setMiningThreads(); if (_dbPath.size()) Defaults::setDBPath(_dbPath); m_vc.setOk(); diff --git a/libwebthree/WebThree.cpp b/libwebthree/WebThree.cpp index a3a95146e..b11a2dccd 100644 --- a/libwebthree/WebThree.cpp +++ b/libwebthree/WebThree.cpp @@ -41,8 +41,8 @@ WebThreeDirect::WebThreeDirect(std::string const& _clientVersion, std::string co { if (_dbPath.size()) Defaults::setDBPath(_dbPath); - if (_interfaces.count("eth")) - m_ethereum.reset(new eth::Client(&m_net, _dbPath, _forceClean, 0, miners)); + if (_interfaces.count("eth")) + m_ethereum.reset(new eth::Client(&m_net, _dbPath, _forceClean, 0, miners)); if (_interfaces.count("shh")) diff --git a/neth/main.cpp b/neth/main.cpp index 2cc3f6239..15815dd40 100644 --- a/neth/main.cpp +++ b/neth/main.cpp @@ -81,7 +81,7 @@ void help() << " -p,--port Connect to remote port (default: 30303)." << endl << " -r,--remote Connect to remote host (default: none)." << endl << " -s,--secret Set the secret key for use with send command (default: auto)." << endl - << " -t,--miners Number of mining threads to start (Default: " << thread::hardware_concurrency() << ")" << endl + << " -t,--miners Number of mining threads to start (Default: " << thread::hardware_concurrency() << ")" << endl << " -u,--public-ip Force public ip to given (default; auto)." << endl << " -v,--verbosity <0..9> Set the log verbosity from 0 to 9 (tmp forced to 1)." << endl << " -x,--peers Attempt to connect to given number of peers (default: 5)." << endl @@ -308,7 +308,7 @@ int main(int argc, char** argv) unsigned mining = ~(unsigned)0; NodeMode mode = NodeMode::Full; unsigned peers = 5; - int miners = -1; + int miners = -1; #if ETH_JSONRPC int jsonrpc = 8080; #endif @@ -403,8 +403,8 @@ int main(int argc, char** argv) g_logVerbosity = atoi(argv[++i]); else if ((arg == "-x" || arg == "--peers") && i + 1 < argc) peers = atoi(argv[++i]); - else if ((arg == "-t" || arg == "--miners") && i + 1 < argc) - miners = atoi(argv[++i]); + else if ((arg == "-t" || arg == "--miners") && i + 1 < argc) + miners = atoi(argv[++i]); else if (arg == "-h" || arg == "--help") help(); else if (arg == "-V" || arg == "--version") @@ -425,7 +425,7 @@ int main(int argc, char** argv) false, mode == NodeMode::Full ? set{"eth", "shh"} : set(), netPrefs, - miners + miners ); web3.setIdealPeerCount(peers); eth::Client* c = mode == NodeMode::Full ? web3.ethereum() : nullptr;