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

Jump to bottom

core: fix unit test for tx hash ordering #1

Merged
merged 2 commits into from
May 18, 2022
Merged

core: fix unit test for tx hash ordering #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ff24e4
core: fix unit test for tx hash ordering
lennybakkalian May 17, 2022
113df3d
core: fix linting
lennybakkalian May 17, 2022
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
4 changes: 2 additions & 2 deletions core/types/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,8 @@ func (s TxByPriceAndHash) Less(i, j int) bool {
// deterministic sorting
cmp := s[i].ImmutableGasPrice().Cmp(s[j].ImmutableGasPrice())
if cmp == 0 {
hi := s[i].Hash()
hj := s[j].Hash()
hi := s[i].Hash()
hj := s[j].Hash()
return bytes.Compare(hi[:], hj[:]) == -1
}
return cmp > 0
Expand Down
14 changes: 7 additions & 7 deletions core/types/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,11 @@ func TestTransactionPriceNonceSort(t *testing.T) {
}
}

// Tests that if multiple transactions have the same price, the ones seen earlier
// are prioritized to avoid network spam attacks aiming for a specific ordering.
func TestTransactionTimeSort(t *testing.T) {
// Tests if transactions with the same gas price are lexicographical sorted by hash
// to prevent network spam attacks and to make the transaction sorting traceable
func TestTransactionHashSort(t *testing.T) {
// Generate a batch of accounts to start with
keys := make([]*ecdsa.PrivateKey, 5)
keys := make([]*ecdsa.PrivateKey, 10)
for i := 0; i < len(keys); i++ {
keys[i], _ = crypto.GenerateKey()
}
Expand Down Expand Up @@ -350,9 +350,9 @@ func TestTransactionTimeSort(t *testing.T) {
if txi.GasPrice().Cmp(next.GasPrice()) < 0 {
t.Errorf("invalid gasprice ordering: tx #%d (A=%x P=%v) < tx #%d (A=%x P=%v)", i, fromi[:4], txi.GasPrice(), i+1, fromNext[:4], next.GasPrice())
}
// Make sure time order is ascending if the txs have the same gas price
if txi.GasPrice().Cmp(next.GasPrice()) == 0 && txi.time.After(next.time) {
t.Errorf("invalid received time ordering: tx #%d (A=%x T=%v) > tx #%d (A=%x T=%v)", i, fromi[:4], txi.time, i+1, fromNext[:4], next.time)
// Make sure hash order is lexicographical if the txs have the same gas price
if txi.GasPrice().Cmp(next.GasPrice()) == 0 && bytes.Compare(txi.Hash().Bytes(), next.Hash().Bytes()) > 0 {
t.Errorf("invalid hash ordering: tx #%d (H=%x) > tx #%d (H=%x)", i, txi.Hash().Bytes()[:4], i+1, next.Hash().Bytes()[:4])
}
}
}
Expand Down