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.

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

eth/catalyst: ensure TxPool is synced in Fork #29876

Merged
merged 1 commit into from
May 29, 2024

Conversation

fjl
Copy link
Contributor

@fjl fjl commented May 29, 2024

This should fix an occasional test failure in ethclient/simulated.TestForkResendTx. Inspection of logs revealed the cause of the failure being that txpool was not done reorganizing by the time Fork is called.

~/d/e/go-ethereum >> go test -run TestForkResendTx -count 200 ./ethclient/simulated 
ok  	github.com/ethereum/go-ethereum/ethclient/simulated	3.645s
~/d/e/go-ethereum >> go test -run TestForkResendTx -count 200 -race ./ethclient/simulated 
ok  	github.com/ethereum/go-ethereum/ethclient/simulated	11.669s

This should fix an occasional test failure in ethclient/simulated.TestForkResendTx.
Inspection of logs revealed the cause of the failure to be that the txpool was not done
reorganizing by the time Fork is called.
@fjl fjl requested a review from gballet as a code owner May 29, 2024 12:35
@fjl fjl added this to the 1.14.4 milestone May 29, 2024
Copy link
Member

@lightclient lightclient left a comment

Choose a reason for hiding this comment

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

Nice!

Copy link
Contributor

@holiman holiman left a comment

Choose a reason for hiding this comment

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

LGTM

@fjl fjl merged commit 6bb13e8 into ethereum:master May 29, 2024
2 of 3 checks passed
@fjl
Copy link
Contributor Author

fjl commented May 29, 2024

Damn, this one's CI run failed with another flaky test: cmd/geth's TestAttachWelcome.

jorgemmsilva pushed a commit to iotaledger/go-ethereum that referenced this pull request Jun 17, 2024
This should fix an occasional test failure in ethclient/simulated.TestForkResendTx.
Inspection of logs revealed the cause of the failure to be that the txpool was not done
reorganizing by the time Fork is called.
stwiname pushed a commit to subquery/data-node-go-ethereum that referenced this pull request Sep 9, 2024
This should fix an occasional test failure in ethclient/simulated.TestForkResendTx.
Inspection of logs revealed the cause of the failure to be that the txpool was not done
reorganizing by the time Fork is called.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants