From 336b37580f6b889d57f888acfc883a179d69e35c Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 8 Dec 2015 23:06:29 +0000 Subject: Register daemon command line arguments to core if they're used in core This fixes coretests, which does not register daemon specific arguments, but uses core, which uses those arguments. Also gets rid of an unwanted dependency on daemon code from core. --- src/daemon/main.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/daemon/main.cpp') diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index a8369f98d..68e375269 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -73,26 +73,15 @@ int main(int argc, char const * argv[]) command_line::add_arg(visible_options, command_line::arg_help); command_line::add_arg(visible_options, command_line::arg_version); command_line::add_arg(visible_options, daemon_args::arg_os_version); - command_line::add_arg(visible_options, command_line::arg_data_dir, default_data_dir.string()); - command_line::add_arg(visible_options, command_line::arg_testnet_data_dir, default_testnet_data_dir.string()); bf::path default_conf = default_data_dir / std::string(CRYPTONOTE_NAME ".conf"); command_line::add_arg(visible_options, daemon_args::arg_config_file, default_conf.string()); - command_line::add_arg(visible_options, command_line::arg_test_drop_download); command_line::add_arg(visible_options, command_line::arg_test_dbg_lock_sleep); - command_line::add_arg(visible_options, command_line::arg_test_drop_download_height); + cryptonote::core::init_options(core_settings); // Settings bf::path default_log = default_data_dir / std::string(CRYPTONOTE_NAME ".log"); command_line::add_arg(core_settings, daemon_args::arg_log_file, default_log.string()); command_line::add_arg(core_settings, daemon_args::arg_log_level); - command_line::add_arg(core_settings, daemon_args::arg_testnet_on); - command_line::add_arg(core_settings, daemon_args::arg_dns_checkpoints); - command_line::add_arg(core_settings, daemon_args::arg_db_type); - command_line::add_arg(core_settings, daemon_args::arg_prep_blocks_threads); - command_line::add_arg(core_settings, daemon_args::arg_fast_block_sync); - command_line::add_arg(core_settings, daemon_args::arg_db_sync_mode); - command_line::add_arg(core_settings, daemon_args::arg_show_time_stats); - command_line::add_arg(core_settings, daemon_args::arg_db_auto_remove_logs); daemonizer::init_options(hidden_options, visible_options); daemonize::t_executor::init_options(core_settings); @@ -146,7 +135,7 @@ int main(int argc, char const * argv[]) epee::g_test_dbg_lock_sleep = command_line::get_arg(vm, command_line::arg_test_dbg_lock_sleep); - std::string db_type = command_line::get_arg(vm, daemon_args::arg_db_type); + std::string db_type = command_line::get_arg(vm, command_line::arg_db_type); // verify that blockchaindb type is valid if(cryptonote::blockchain_db_types.count(db_type) == 0) @@ -159,7 +148,7 @@ int main(int argc, char const * argv[]) return 0; } - bool testnet_mode = command_line::get_arg(vm, daemon_args::arg_testnet_on); + bool testnet_mode = command_line::get_arg(vm, command_line::arg_testnet_on); auto data_dir_arg = testnet_mode ? command_line::arg_testnet_data_dir : command_line::arg_data_dir; -- cgit v1.2.3