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

Setup e2e test for Stride pool migration (backport #4393) #4394

Merged
merged 1 commit into from
Feb 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2023

This is an automatic backport of pull request #4393 done by Mergify.
Cherry-pick of b3cd00c has failed:

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

You are currently cherry-picking commit b3cd00c0.
  (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/e2e/e2e_test.go
	modified:   x/gamm/keeper/multihop.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   proto/osmosis/poolmanager/v1beta1/genesis.proto
	deleted by us:   proto/osmosis/poolmanager/v1beta1/module_route.proto
	both modified:   tests/e2e/initialization/config.go
	deleted by us:   x/poolmanager/create_pool.go
	deleted by us:   x/poolmanager/create_pool_test.go
	deleted by us:   x/poolmanager/export_test.go
	deleted by us:   x/poolmanager/keeper.go
	deleted by us:   x/poolmanager/keeper_test.go
	deleted by us:   x/poolmanager/types/genesis.pb.go
	deleted by us:   x/poolmanager/types/keys.go
	deleted by us:   x/poolmanager/types/module_route.pb.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

@mergify mergify bot added the conflicts label Feb 22, 2023
@mergify mergify bot assigned p0mvn Feb 22, 2023
@github-actions github-actions bot added the C:x/gamm Changes, features and bugs related to the gamm module. label Feb 22, 2023
@p0mvn p0mvn force-pushed the mergify/bp/v14.x/pr-4393 branch from eda5a93 to 356ac1f Compare February 22, 2023 22:10
@p0mvn p0mvn merged commit 19e3b25 into v14.x Feb 22, 2023
@p0mvn p0mvn deleted the mergify/bp/v14.x/pr-4393 branch February 22, 2023 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/gamm Changes, features and bugs related to the gamm module. conflicts
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant