4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

should fix testnet for daemonize

Browse Source
This commit is contained in:
Thomas Winget 2015-02-10 19:01:37 -05:00
parent 6bd17745b4
commit aefe02f790
No known key found for this signature in database
GPG Key ID: 58131A160789E630
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/daemon/core.h
View File

@ -34,6 +34,7 @@
#include "misc_log_ex.h" #include "misc_log_ex.h"
#include <stdexcept> #include <stdexcept>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include "daemon/command_line_args.h"
namespace daemonize namespace daemonize
{ {
@ -59,10 +60,15 @@ public:
: m_core{nullptr} : m_core{nullptr}
, m_vm_HACK{vm} , m_vm_HACK{vm}
{ {
bool testnet = command_line::get_arg(vm, daemon_args::arg_testnet_on);
cryptonote::checkpoints checkpoints; cryptonote::checkpoints checkpoints;
if (!cryptonote::create_checkpoints(checkpoints)) if (!testnet)
{ {
throw std::runtime_error("Failed to initialize checkpoints"); if (!cryptonote::create_checkpoints(checkpoints))
{
throw std::runtime_error("Failed to initialize checkpoints");
}
} }
m_core.set_checkpoints(std::move(checkpoints)); m_core.set_checkpoints(std::move(checkpoints));
} }

2
src/daemon/main.cpp
View File

@ -60,6 +60,7 @@ int main(int argc, char const * argv[])
po::positional_options_description positional_options; po::positional_options_description positional_options;
{ {
bf::path default_data_dir = daemonizer::get_default_data_dir(); bf::path default_data_dir = daemonizer::get_default_data_dir();
bf::path default_testnet_data_dir = {default_data_dir / "testnet"};
// Misc Options // Misc Options
@ -67,6 +68,7 @@ int main(int argc, char const * argv[])
command_line::add_arg(visible_options, command_line::arg_version); 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, 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_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"); 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, daemon_args::arg_config_file, default_conf.string());