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

Merge pull request #4768

Browse Source 
cf552c75 tx_pool: allow take_tx to work without m_txs_by_fee_and_receive_time (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-11-16 10:59:25 +02:00
commit 9827958f5e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
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

@ -459,8 +459,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
{ {
@ -499,6 +497,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;