Merge pull request #1759

417b126f Fix core_tests breaking on startup (moneromooo-monero)

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)

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;