mirror of
https://github.com/monero-project/monero.git
synced 2024-12-23 20:19:34 +00:00
Merge pull request #4768
cf552c75
tx_pool: allow take_tx to work without m_txs_by_fee_and_receive_time (moneromooo-monero)
This commit is contained in:
commit
9827958f5e
1 changed files with 2 additions and 3 deletions
|
@ -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,7 +497,8 @@ namespace cryptonote
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_txs_by_fee_and_receive_time.erase(sorted_it);
|
if (sorted_it != m_txs_by_fee_and_receive_time.end())
|
||||||
|
m_txs_by_fee_and_receive_time.erase(sorted_it);
|
||||||
++m_cookie;
|
++m_cookie;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue