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

refactor: generic fallback ante decorator (backport #102) #106

Merged
merged 3 commits into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 10, 2024

Closes BLO-1330


This is an automatic backport of pull request #102 done by Mergify.

(cherry picked from commit 04c7e6f)

# Conflicts:
#	tests/app/app.go
Copy link
Author

mergify bot commented Jun 10, 2024

Cherry-pick of 04c7e6f has failed:

On branch mergify/bp/sdk-47/pr-102
Your branch is up to date with 'origin/sdk-47'.

You are currently cherry-picking commit 04c7e6f.
  (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:   tests/app/ante.go
	modified:   x/feemarket/ante/fee.go
	modified:   x/feemarket/ante/suite/suite.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/app/app.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

@mergify mergify bot requested a review from davidterpay as a code owner June 10, 2024 13:52
@mergify mergify bot added the conflicts label Jun 10, 2024
@aljo242 aljo242 merged commit 97cf83d into sdk-47 Jun 10, 2024
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/sdk-47/pr-102 branch June 10, 2024 14:59
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.

1 participant