mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
Merge pull request #1759
417b126f
Fix core_tests breaking on startup (moneromooo-monero)
This commit is contained in:
commit
5f48a1b000
@ -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)
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user