Skip to content

test(core/txpool/legacypool): drop shared config writes from parallel tests #2517

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

Open
gzliudan wants to merge 1 commit into
base: dev-upgrade
Choose a base branch
from
Open

test(core/txpool/legacypool): drop shared config writes from parallel tests #2517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions core/txpool/legacypool/legacypool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,29 +1520,29 @@ func TestQueueAccountLimiting(t *testing.T) {

account := crypto.PubkeyToAddress(key.PublicKey)
testAddBalance(pool, account, big.NewInt(300000000000000))
testTxPoolConfig.AccountQueue = 10
accountQueue := uint64(10)

// Keep queuing up transactions and make sure all above a limit are dropped
for i := uint64(1); i <= testTxPoolConfig.AccountQueue; i++ {
for i := uint64(1); i <= accountQueue; i++ {
if err := pool.addRemoteSync(pricedTransaction(i, 100000, big.NewInt(300000000), key)); err != nil {
t.Fatalf("tx %d: failed to add transaction: %v", i, err)
}
if len(pool.pending) != 0 {
t.Errorf("tx %d: pending pool size mismatch: have %d, want %d", i, len(pool.pending), 0)
}
list, _ := pool.queue.get(account)
if i <= testTxPoolConfig.AccountQueue {
if i <= accountQueue {
if list.Len() != int(i) {
t.Errorf("tx %d: queue size mismatch: have %d, want %d", i, list.Len(), i)
}
} else {
if list.Len() != int(testTxPoolConfig.AccountQueue) {
t.Errorf("tx %d: queue limit mismatch: have %d, want %d", i, list.Len(), testTxPoolConfig.AccountQueue)
if list.Len() != int(accountQueue) {
t.Errorf("tx %d: queue limit mismatch: have %d, want %d", i, list.Len(), accountQueue)
}
}
}
if pool.all.Count() != int(testTxPoolConfig.AccountQueue) {
t.Errorf("total transaction mismatch: have %d, want %d", pool.all.Count(), testTxPoolConfig.AccountQueue)
if pool.all.Count() != int(accountQueue) {
t.Errorf("total transaction mismatch: have %d, want %d", pool.all.Count(), accountQueue)
}
}

Expand Down Expand Up @@ -1738,15 +1738,15 @@ func TestPendingLimiting(t *testing.T) {

account := crypto.PubkeyToAddress(key.PublicKey)
testAddBalance(pool, account, big.NewInt(400000000000000))
testTxPoolConfig.AccountQueue = 10
accountQueue := uint64(10)

// Keep track of transaction events to ensure all executables get announced
events := make(chan core.NewTxsEvent, testTxPoolConfig.AccountQueue)
events := make(chan core.NewTxsEvent, accountQueue)
sub := pool.txFeed.Subscribe(events)
defer sub.Unsubscribe()

// Keep queuing up transactions and make sure all above a limit are dropped
for i := uint64(0); i < testTxPoolConfig.AccountQueue; i++ {
for i := uint64(0); i < accountQueue; i++ {
if err := pool.addRemoteSync(pricedTransaction(i, 100000, big.NewInt(300000000), key)); err != nil {
t.Fatalf("tx %d: failed to add transaction: %v", i, err)
}
Expand All @@ -1757,10 +1757,10 @@ func TestPendingLimiting(t *testing.T) {
t.Errorf("tx %d: queue size mismatch: have %d, want %d", i, len(pool.queue.addresses()), 0)
}
}
if pool.all.Count() != int(testTxPoolConfig.AccountQueue) {
t.Errorf("total transaction mismatch: have %d, want %d", pool.all.Count(), testTxPoolConfig.AccountQueue+5)
if pool.all.Count() != int(accountQueue) {
t.Errorf("total transaction mismatch: have %d, want %d", pool.all.Count(), accountQueue)
}
if err := validateEvents(events, int(testTxPoolConfig.AccountQueue)); err != nil {
if err := validateEvents(events, int(accountQueue)); err != nil {
t.Fatalf("event firing failed: %v", err)
}
if err := validatePoolInternals(pool); err != nil {
Expand Down