rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 13:23:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #586

Browse Source 
40f97ce core: do not use the persistent pool state for tests (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-12-31 17:58:06 +02:00
commit c991865ffc
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/cryptonote_core.cpp
View File

@ -222,7 +222,7 @@ namespace cryptonote
{
bool r = handle_command_line(vm);
r = m_mempool.init(m_config_folder);
r = m_mempool.init(m_fakechain ? std::string() : m_config_folder);
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize memory pool");
#if BLOCKCHAIN_DB == DB_LMDB

6
src/cryptonote_core/tx_pool.cpp
View File

@ -612,6 +612,9 @@ namespace cryptonote
CRITICAL_REGION_LOCAL(m_transactions_lock);
m_config_folder = config_folder;
if (m_config_folder.empty())
return true;
std::string state_file_path = config_folder + "/" + CRYPTONOTE_POOLDATA_FILENAME;
boost::system::error_code ec;
if(!boost::filesystem::exists(state_file_path, ec))
@ -648,6 +651,9 @@ namespace cryptonote
//---------------------------------------------------------------------------------
bool tx_memory_pool::deinit()
{
if (m_config_folder.empty())
return true;
if (!tools::create_directories_if_necessary(m_config_folder))
{
LOG_PRINT_L1("Failed to create data directory: " << m_config_folder);