ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve TxQ edge-case handling logic (RIPD-1200):

Browse Source 
* HashRouter: Track relay expiration separately from item lifespan.
** Renamed `swapSet` to `shouldRelay`.
** Cleaned up `HashRouter` member names and removed unused code.
** Remove `SF_RELAYED` flag.
* Fix TxQ edge case replacing dropped transactions.
* Fix TxQ bug in maximumTxnPerAccount check.
This commit is contained in:
Edward Hennis
2016-06-15 15:01:21 -04:00
committed by seelabs
parent a22fa21ce4
commit 177a52473a
8 changed files with 223 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ripple/app/misc/impl/TxQ.cpp
View File

@@ -308,7 +308,7 @@ TxQ::canBeHeld(STTx const& tx, OpenView const& view,
an early one fail or get dropped.
*/
canBeHeld = accountIter == byAccount_.end() ||
!replacementIter ||
replacementIter ||
accountIter->second.getTxnCount() <
setup_.maximumTxnPerAccount;
}
@@ -521,9 +521,10 @@ TxQ::apply(Application& app, OpenView& view,
*/
if (std::next(existingIter) != txQAcct.transactions.end())
{
// Only the last tx in the queue should have
// !consequences, and this can't be the last tx.
assert(existingIter->second.consequences);
// Normally, only the last tx in the queue will have
// !consequences, but an expired transaction can be
// replaced, and that replacement won't have it set,
// and that's ok.
if (!existingIter->second.consequences)
existingIter->second.consequences.emplace(
calculateConsequences(