|
|
|
@ -41,6 +41,7 @@ using namespace epee;
|
|
|
|
|
#include "cryptonote_format_utils.h"
|
|
|
|
|
#include "misc_language.h"
|
|
|
|
|
#include <csignal>
|
|
|
|
|
#include <p2p/net_node.h>
|
|
|
|
|
#include "cryptonote_core/checkpoints.h"
|
|
|
|
|
#include "ringct/rctTypes.h"
|
|
|
|
|
#include "blockchain_db/blockchain_db.h"
|
|
|
|
@ -258,8 +259,17 @@ namespace cryptonote
|
|
|
|
|
|
|
|
|
|
m_fakechain = test_options != NULL;
|
|
|
|
|
bool r = handle_command_line(vm);
|
|
|
|
|
bool testnet = command_line::get_arg(vm, command_line::arg_testnet_on);
|
|
|
|
|
auto p2p_bind_arg = testnet ? nodetool::arg_testnet_p2p_bind_port : nodetool::arg_p2p_bind_port;
|
|
|
|
|
std::string m_port = command_line::get_arg(vm, p2p_bind_arg);
|
|
|
|
|
std::string m_config_folder_mempool = m_config_folder;
|
|
|
|
|
|
|
|
|
|
if ((!testnet && m_port != std::to_string(::config::P2P_DEFAULT_PORT))
|
|
|
|
|
|| (testnet && m_port != std::to_string(::config::testnet::P2P_DEFAULT_PORT))) {
|
|
|
|
|
m_config_folder_mempool = m_config_folder_mempool + "/" + m_port;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
r = m_mempool.init(m_fakechain ? std::string() : m_config_folder);
|
|
|
|
|
r = m_mempool.init(m_fakechain ? std::string() : m_config_folder_mempool);
|
|
|
|
|
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize memory pool");
|
|
|
|
|
|
|
|
|
|
std::string db_type = command_line::get_arg(vm, command_line::arg_db_type);
|
|
|
|
|