Merge BlockchainDB into upstream
This commit is contained in:
@@ -42,6 +42,7 @@
|
||||
#include "rpc/core_rpc_server.h"
|
||||
#include <boost/program_options.hpp>
|
||||
#include "daemon/command_line_args.h"
|
||||
#include "blockchain_db/db_types.h"
|
||||
|
||||
namespace po = boost::program_options;
|
||||
namespace bf = boost::filesystem;
|
||||
@@ -84,6 +85,7 @@ int main(int argc, char const * argv[])
|
||||
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);
|
||||
daemonizer::init_options(hidden_options, visible_options);
|
||||
daemonize::t_executor::init_options(core_settings);
|
||||
|
||||
@@ -136,6 +138,19 @@ 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);
|
||||
|
||||
// verify that blockchaindb type is valid
|
||||
if(cryptonote::blockchain_db_types.count(db_type) == 0)
|
||||
{
|
||||
std::cout << "Invalid database type (" << db_type << "), available types are:" << std::endl;
|
||||
for (const auto& type : cryptonote::blockchain_db_types)
|
||||
{
|
||||
std::cout << "\t" << type << std::endl;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool testnet_mode = command_line::get_arg(vm, daemon_args::arg_testnet_on);
|
||||
|
||||
auto data_dir_arg = testnet_mode ? command_line::arg_testnet_data_dir : command_line::arg_data_dir;
|
||||
|
||||
Reference in New Issue
Block a user