Skip to content

test(x/gamm): remove liquidity events (backport #2186)#2291

Merged
p0mvn merged 1 commit intov11.xfrom
mergify/bp/v11.x/pr-2186
Aug 3, 2022
Merged

test(x/gamm): remove liquidity events (backport #2186)#2291
p0mvn merged 1 commit intov11.xfrom
mergify/bp/v11.x/pr-2186

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Aug 3, 2022

This is an automatic backport of pull request #2186 done by Mergify.
Cherry-pick of 40f19a3 has failed:

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

You are currently cherry-picking commit 40f19a38.
  (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:
	new file:   app/apptesting/events.go
	modified:   x/gamm/keeper/internal/events/emit_test.go
	modified:   x/gamm/keeper/msg_server.go
	modified:   x/gamm/keeper/msg_server_test.go
	modified:   x/gamm/keeper/swap_test.go
	modified:   x/gamm/spec/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/gamm/keeper/pool_service_test.go
	both modified:   x/superfluid/keeper/unpool_test.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 requested a review from a team August 3, 2022 18:10
@mergify mergify bot added the conflicts label Aug 3, 2022
@mergify mergify bot assigned p0mvn Aug 3, 2022
@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. C:x/superfluid labels Aug 3, 2022
@p0mvn p0mvn force-pushed the mergify/bp/v11.x/pr-2186 branch from f74bc21 to 2ea3e53 Compare August 3, 2022 19:09
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. C:x/superfluid conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant