4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 11:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix core_tests breaking on startup

Browse Source 
You're wondering how this fixes core tests, aren't you...

It prevents the miner (initialized by cryptonote::core) from
breaking trying to access arguments that were not added.
Since the tests don't use the miner directly, it makes more
sense to have cryptonote_core add those, since it also uses
the miner.
This commit is contained in:
moneromooo-monero 2017-02-21 15:06:07 +00:00
parent 2b67346ded
commit 417b126fc4
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/cryptonote_core.cpp
View File

@ -155,6 +155,8 @@ namespace cryptonote
// we now also need some of net_node's options (p2p bind arg, for separate data dir) // we now also need some of net_node's options (p2p bind arg, for separate data dir)
command_line::add_arg(desc, nodetool::arg_testnet_p2p_bind_port, false); command_line::add_arg(desc, nodetool::arg_testnet_p2p_bind_port, false);
command_line::add_arg(desc, nodetool::arg_p2p_bind_port, false); command_line::add_arg(desc, nodetool::arg_p2p_bind_port, false);
miner::init_options(desc);
} }
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
bool core::handle_command_line(const boost::program_options::variables_map& vm) bool core::handle_command_line(const boost::program_options::variables_map& vm)

1
src/daemon/core.h
View File

@ -45,7 +45,6 @@ public:
static void init_options(boost::program_options::options_description & option_spec) static void init_options(boost::program_options::options_description & option_spec)
{ {
cryptonote::core::init_options(option_spec); cryptonote::core::init_options(option_spec);
cryptonote::miner::init_options(option_spec);
} }
private: private:
typedef cryptonote::t_cryptonote_protocol_handler<cryptonote::core> t_protocol_raw; typedef cryptonote::t_cryptonote_protocol_handler<cryptonote::core> t_protocol_raw;