diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-21 17:22:33 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-21 17:22:33 +0200 |
| commit | 5f48a1b000397e815626a85d08286d7afcf41cca (patch) | |
| tree | 7753f1776d5e814d734f5570cc21aa83c41b8b34 | |
| parent | ecbd3f0798352bdc7bc32351bcd171291236139b (diff) | |
| parent | 417b126fc420b7bac9a385f9576a5b80e840ee67 (diff) | |
| download | monzero-core-5f48a1b000397e815626a85d08286d7afcf41cca.tar.gz monzero-core-5f48a1b000397e815626a85d08286d7afcf41cca.tar.xz monzero-core-5f48a1b000397e815626a85d08286d7afcf41cca.zip | |
Merge pull request #1759
417b126f Fix core_tests breaking on startup (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 2 | ||||
| -rw-r--r-- | src/daemon/core.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 73f01559d..ce5acdaf8 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -155,6 +155,8 @@ namespace cryptonote // 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_p2p_bind_port, false); + + miner::init_options(desc); } //----------------------------------------------------------------------------------------------- bool core::handle_command_line(const boost::program_options::variables_map& vm) diff --git a/src/daemon/core.h b/src/daemon/core.h index 23f7a9f63..b23423fdf 100644 --- a/src/daemon/core.h +++ b/src/daemon/core.h @@ -45,7 +45,6 @@ public: static void init_options(boost::program_options::options_description & option_spec) { cryptonote::core::init_options(option_spec); - cryptonote::miner::init_options(option_spec); } private: typedef cryptonote::t_cryptonote_protocol_handler<cryptonote::core> t_protocol_raw; |