tx_pool: allow take_tx to work without m_txs_by_fee_and_receive_time
This should make it possible to have two daemons running on the same database again.
This commit is contained in:
parent
4cbb476cd1
commit
cf552c752d
|
@ -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,7 +487,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 New Issue