Skip to content

test(mempool): fix TestMempoolUpdateDoesNotPanicWhenApplicationMissedTx (backport #2242)#2247

Merged
hvanz merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-2242
Feb 6, 2024
Merged

test(mempool): fix TestMempoolUpdateDoesNotPanicWhenApplicationMissedTx (backport #2242)#2247
hvanz merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-2242

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2024

This is an automatic backport of pull request #2242 done by Mergify.
Cherry-pick of 71dbb46 has failed:

On branch mergify/bp/v1.x/pr-2242
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 71dbb46f9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mempool/clist_mempool_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…Tx (#2242)

The test `TestMempoolUpdateDoesNotPanicWhenApplicationMissedTx` has two
problems:
- First, the test calls `reqRes.InvokeCallback()` on every CheckTx
request-response, but there's no callback set on `reqRes` so the tx are
not really added to the mempool at this point.
- Near the end, it makes two calls to `callback` on requests of type
`CHECK_TX_TYPE_CHECK` when they should be of type
`CHECK_TX_TYPE_RECHECK`. The intention here was to process the recheck
responses; instead, the two txs are added to the mempool.

(cherry picked from commit 71dbb46)

# Conflicts:
#	mempool/clist_mempool_test.go
@mergify mergify bot added the conflicts label Feb 6, 2024
@mergify mergify bot requested a review from a team as a code owner February 6, 2024 08:13
@mergify mergify bot requested a review from a team February 6, 2024 08:13
@hvanz hvanz merged commit 85806de into v1.x Feb 6, 2024
@hvanz hvanz deleted the mergify/bp/v1.x/pr-2242 branch February 6, 2024 10:34
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.

2 participants