Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2025

Fixes #2341


This is an automatic backport of pull request #2340 done by [Mergify](https://mergify.com).

Fixes #2341

---------

Co-authored-by: Callum Waters <[email protected]>
(cherry picked from commit eddeac4)

# Conflicts:
#	mempool/cat/pool_test.go
Copy link
Contributor Author

mergify bot commented Aug 19, 2025

Cherry-pick of eddeac4 has failed:

On branch mergify/bp/main/pr-2340
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit eddeac4c.
  (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)

Changes to be committed:
	modified:   mempool/cat/pool.go

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

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

Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

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

still couple things that need changing

@evan-forbes evan-forbes marked this pull request as draft September 1, 2025 15:57
@evan-forbes
Copy link
Member

converting to a draft, but agree we should fix and merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CAT should not return an error for app rejections
4 participants