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(poolmanager): GetPoolDenoms method on PoolI for SQS (backport #6863) #6902

Merged
merged 4 commits into from
Nov 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 21, 2023

This is an automatic backport of pull request #6863 done by Mergify.
Cherry-pick of 4c54425 has failed:

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

You are currently cherry-picking commit 4c54425c.
  (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/mocks/cfmm_pool.go
	modified:   tests/mocks/cl_pool.go
	modified:   tests/mocks/pool.go
	modified:   x/concentrated-liquidity/model/pool.go
	modified:   x/concentrated-liquidity/model/pool_test.go
	modified:   x/cosmwasmpool/model/pool.go
	modified:   x/cosmwasmpool/model/pool_test.go
	modified:   x/cosmwasmpool/model/store_model.go
	modified:   x/gamm/pool-models/balancer/pool.go
	modified:   x/gamm/pool-models/balancer/pool_test.go
	modified:   x/gamm/pool-models/stableswap/pool.go
	modified:   x/poolmanager/types/pool.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* refactor(poolmanager): GetPoolDenoms method on PoolI for SQS

* changelog

* mocks

* change proto dep

* transmuter pool

* cfmm test

* CL test

(cherry picked from commit 4c54425)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Nov 21, 2023
@mergify mergify bot assigned p0mvn Nov 21, 2023
@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. C:x/concentrated-liquidity C:x/poolmanager labels Nov 21, 2023
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@p0mvn p0mvn merged commit eeb3af7 into v20.x Nov 21, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v20.x/pr-6863 branch November 21, 2023 05:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/concentrated-liquidity C:x/gamm Changes, features and bugs related to the gamm module. C:x/poolmanager conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant