fix: TestTxPool_ConcurrentlyAddingTx #1501
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rootulp
requested review from
cmwaters,
rach-id,
evan-forbes and
ninabarbakadze
and removed request for
a team
evan-forbes
approved these changes
Sep 25, 2024
staheri14
approved these changes
Sep 25, 2024
staheri14
reviewed
Sep 25, 2024
| @@ -747,7 +748,10 @@ func TestTxPool_ConcurrentlyAddingTx(t *testing.T) { | |||
| errCount++ | |||
| } | |||
| } | |||
| require.Equal(t, numTxs-1, errCount) | |||
| // At least one tx should succeed and get added to the mempool without an error. | |||
There was a problem hiding this comment.
At least one tx should succeed and get added to the mempool without an error.
I've already approved it, but I was thinking we should maybe set it to 2, or something higher than 1, to ensure the concurrent adding works properly.
rootulp
added a commit
that referenced
this pull request
Sep 30, 2024
Closes #1468 by pulling upstream [v0.34.35](https://github.com/cometbft/cometbft/releases/tag/v0.34.35) with these notable merge conflicts: - Our repo upgraded Go past what upstream has so I choose to retain the more recent Go version And these changes to make unit tests pass: 1. Refactor CI to run all tests in one execution. It takes the same time ([4 mins](https://github.com/celestiaorg/celestia-core/actions/runs/11038290102/job/30661243408?pr=1495)) as it [previously did](https://github.com/celestiaorg/celestia-core/actions/runs/10956425121). But now it's easier to reason about the flakes. 2. Included #1503 3. Included #1501 ## FLUPs 1. #1504 2. Opens #1502 and skips that test ## Testing I used go mod replace and verified that celestia-app can use this version of celestia-core. - [x] `single-node.sh` - [x] `mocha.sh` --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Thane Thomson <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Sergio Mena <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jasmina Malicevic <[email protected]> Co-authored-by: Lasaro <[email protected]> Co-authored-by: Thane Thomson <[email protected]> Co-authored-by: mmsqe <[email protected]> Co-authored-by: yihuang <[email protected]> Co-authored-by: Steven Ferrer <[email protected]> Co-authored-by: Chill Validation <[email protected]> Co-authored-by: Aliasgar Merchant <[email protected]> Co-authored-by: Philip Offtermatt <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Hernán Vanzetto <[email protected]> Co-authored-by: Adi Seredinschi <[email protected]> Co-authored-by: Ethan Buchman <[email protected]> Co-authored-by: Andy Nogueira <[email protected]> Co-authored-by: Anton Kaliaev <[email protected]> Co-authored-by: Troy Kessler <[email protected]> Co-authored-by: forcodedancing <[email protected]> Co-authored-by: Mikhail Zabaluev <[email protected]> Co-authored-by: Alexsandro <[email protected]> Co-authored-by: Alessandro <[email protected]> Co-authored-by: Jacob Gadikian <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1383
Testing