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(CL): change tick API from sdk.Dec to osmomath.BigDec (backport #6033) #6135

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2023

This is an automatic backport of pull request #6033 done by Mergify.
Cherry-pick of 36e7201 has failed:

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

You are currently cherry-picking commit 36e72019.
  (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/cl-genesis-positions/convert.go
	modified:   tests/e2e/e2e_test.go
	modified:   x/concentrated-liquidity/export_test.go
	modified:   x/concentrated-liquidity/fuzz_test.go
	modified:   x/concentrated-liquidity/incentives.go
	modified:   x/concentrated-liquidity/incentives_test.go
	modified:   x/concentrated-liquidity/keeper_test.go
	modified:   x/concentrated-liquidity/lp.go
	modified:   x/concentrated-liquidity/math/math.go
	modified:   x/concentrated-liquidity/math/math_test.go
	modified:   x/concentrated-liquidity/model/pool.go
	modified:   x/concentrated-liquidity/model/pool_test.go
	modified:   x/concentrated-liquidity/query.go
	modified:   x/concentrated-liquidity/query_test.go
	modified:   x/concentrated-liquidity/range_test.go
	modified:   x/concentrated-liquidity/spread_rewards_test.go
	modified:   x/concentrated-liquidity/swaps_test.go
	modified:   x/concentrated-liquidity/swapstrategy/one_for_zero.go
	modified:   x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
	modified:   x/concentrated-liquidity/swapstrategy/swap_strategy.go
	modified:   x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
	modified:   x/concentrated-liquidity/swapstrategy/zero_for_one.go
	modified:   x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
	modified:   x/concentrated-liquidity/tick.go
	modified:   x/concentrated-liquidity/types/errors.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/concentrated-liquidity/math/tick.go
	both modified:   x/concentrated-liquidity/math/tick_test.go
	both modified:   x/concentrated-liquidity/position_test.go
	both modified:   x/concentrated-liquidity/swaps.go
	both modified:   x/concentrated-liquidity/swaps_tick_cross_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

* refactor(CL): change tick API from sdk.Dec to osmomath.BigDec

* changelog

(cherry picked from commit 36e7201)

# Conflicts:
#	CHANGELOG.md
#	x/concentrated-liquidity/math/tick.go
#	x/concentrated-liquidity/math/tick_test.go
#	x/concentrated-liquidity/position_test.go
#	x/concentrated-liquidity/swaps.go
#	x/concentrated-liquidity/swaps_tick_cross_test.go
@p0mvn
Copy link
Member

p0mvn commented Aug 23, 2023

Too many conflicts - closing. Since v17 is out today. I will resync #6136 from its start

@p0mvn p0mvn closed this Aug 23, 2023
@mergify mergify bot deleted the mergify/bp/v16.x/pr-6033 branch August 23, 2023 09:20
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