nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tx_pool: allow take_tx to work without m_txs_by_fee_and_receive_time

Browse Source 
This should make it possible to have two daemons running on the
same database again.
This commit is contained in:
moneromooo-monero 2018-10-31 14:43:13 +00:00
parent 4cbb476cd1
commit cf552c752d
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptonote_core/tx_pool.cpp
View File

@ -454,8 +454,6 @@ namespace cryptonote
CRITICAL_REGION_LOCAL1(m_blockchain); CRITICAL_REGION_LOCAL1(m_blockchain);
auto sorted_it = find_tx_in_sorted_container(id); auto sorted_it = find_tx_in_sorted_container(id);
if (sorted_it == m_txs_by_fee_and_receive_time.end())
return false;
try try
{ {
@ -489,6 +487,7 @@ namespace cryptonote
return false; return false;
} }
if (sorted_it != m_txs_by_fee_and_receive_time.end())
m_txs_by_fee_and_receive_time.erase(sorted_it); m_txs_by_fee_and_receive_time.erase(sorted_it);
++m_cookie; ++m_cookie;
return true; return true;