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

feat: fall back to default cosmos sdk fee deductor (backport #99) #100

Merged
merged 3 commits into from
Jun 6, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 4, 2024

Based on: https://github.com/neutron-org/neutron/pull/551/files


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

* beauty

* enable all

* format

* fix

* clean

* mod

* fix?

* fix?

* fix

* push

(cherry picked from commit 4b6c5fc)

# Conflicts:
#	go.mod
#	go.sum
#	tests/e2e/consumer.go
#	tests/e2e/e2e_test.go
#	tests/e2e/go.mod
#	tests/e2e/go.sum
Copy link
Author

mergify bot commented Jun 4, 2024

Cherry-pick of 4b6c5fc has failed:

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

You are currently cherry-picking commit 4b6c5fc.
  (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:   tests/e2e/setup.go
	modified:   tests/e2e/suite.go
	modified:   x/feemarket/ante/fee.go
	modified:   x/feemarket/ante/fee_test.go
	modified:   x/feemarket/ante/suite/suite.go
	modified:   x/feemarket/post/fee.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   tests/e2e/consumer.go
	both modified:   tests/e2e/e2e_test.go
	both modified:   tests/e2e/go.mod
	both modified:   tests/e2e/go.sum

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 4, 2024 21:09
@mergify mergify bot added the conflicts label Jun 4, 2024
aljo242 added 2 commits June 6, 2024 12:35
@aljo242 aljo242 merged commit 6a4e4a2 into sdk-47 Jun 6, 2024
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/sdk-47/pr-99 branch June 6, 2024 17:26
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