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: reduce number of returns for creating full range position (backport #6004) #6009

Merged
merged 2 commits into from
Aug 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2023

This is an automatic backport of pull request #6004 done by Mergify.
Cherry-pick of 07c8556 has failed:

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

You are currently cherry-picking commit 07c85560.
  (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:   app/apptesting/concentrated_liquidity.go
	modified:   app/upgrades/v16/upgrades.go
	modified:   x/concentrated-liquidity/pool_test.go
	modified:   x/concentrated-liquidity/swaps_tick_cross_test.go
	modified:   x/concentrated-liquidity/types/cl.go
	modified:   x/gamm/keeper/migrate.go
	modified:   x/gamm/keeper/migrate_test.go
	modified:   x/gamm/types/expected_keepers.go
	modified:   x/lockup/keeper/lock_test.go
	modified:   x/superfluid/keeper/concentrated_liquidity.go
	modified:   x/superfluid/keeper/concentrated_liquidity_test.go
	modified:   x/superfluid/keeper/grpc_query_test.go
	modified:   x/superfluid/keeper/migrate_test.go
	modified:   x/superfluid/keeper/msg_server.go
	modified:   x/superfluid/keeper/msg_server_test.go
	modified:   x/superfluid/types/expected_keepers.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   app/upgrades/v17/upgrades.go
	both modified:   x/concentrated-liquidity/lp_test.go
	both modified:   x/concentrated-liquidity/position.go
	both modified:   x/concentrated-liquidity/position_test.go
	both modified:   x/superfluid/keeper/export_test.go
	both modified:   x/superfluid/keeper/migrate.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 Aug 9, 2023
@mergify mergify bot assigned p0mvn Aug 9, 2023
@github-actions github-actions bot added C:app-wiring Changes to the app folder C:x/concentrated-liquidity C:x/gamm Changes, features and bugs related to the gamm module. C:x/lockup C:x/superfluid labels Aug 9, 2023
@p0mvn
Copy link
Member

p0mvn commented Aug 10, 2023

@devbot-wizard fix

@p0mvn
Copy link
Member

p0mvn commented Aug 10, 2023

devbot fix

@p0mvn
Copy link
Member

p0mvn commented Aug 10, 2023

devbot help

@p0mvn p0mvn merged commit 4509279 into v16.x Aug 10, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v16.x/pr-6004 branch August 10, 2023 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:app-wiring Changes to the app folder C:x/concentrated-liquidity C:x/gamm Changes, features and bugs related to the gamm module. C:x/lockup C:x/superfluid conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant