Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse sort order #6106

Merged
merged 3 commits into from
Nov 8, 2023
+2 −2
Merged

Reverse sort order #6106

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12eb3d5
Reverse added order and sequence number
matthew1001 Oct 30, 2023
68e830d
Merge branch 'main' into reverse-sort-order
matthew1001 Nov 8, 2023
9b0971f
Remove extraneous 'addedAt' check
matthew1001 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .../hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.hyperledger.besu.plugin.services.MetricsSystem;

import java.time.Clock;
import java.util.Comparator;
import java.util.Iterator;
import java.util.NavigableSet;
import java.util.TreeSet;
Expand All @@ -39,8 +40,8 @@ public class GasPricePendingTransactionsSorter extends AbstractPendingTransactio
new TreeSet<>(
comparing(PendingTransaction::hasPriority)
.thenComparing(PendingTransaction::getGasPrice)
.thenComparing(PendingTransaction::getAddedAt)
.thenComparing(PendingTransaction::getSequence)
.thenComparing(PendingTransaction::getAddedAt, Comparator.reverseOrder())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the comparison of addedAt is redundant and can be removed, since sequence is incremental

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I wondered whether there was any difference in practice between the addedAt and sequence checks. I've removed addedAt under 9b0971f

.thenComparing(PendingTransaction::getSequence, Comparator.reverseOrder())
.reversed());

public GasPricePendingTransactionsSorter(
Expand Down
Loading