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

Move binary search from osmomath to osmoutils (backport #3763) #3765

Merged
merged 2 commits into from
Dec 16, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2022

This is an automatic backport of pull request #3763 done by Mergify.
Cherry-pick of 3095a7d has failed:

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

You are currently cherry-picking commit 3095a7d3.
  (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:   CHANGELOG.md
	renamed:    osmoutils/binary_search_test.go -> osmomath/binary_search_test.go
	modified:   osmomath/math.go
	deleted:    osmoutils/binary_search.go
	modified:   x/gamm/pool-models/balancer/util_test.go
	modified:   x/gamm/pool-models/internal/test_helpers/test_helpers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   osmomath/binary_search.go
	both modified:   x/gamm/pool-models/balancer/pool_test.go
	both modified:   x/gamm/pool-models/internal/cfmm_common/lp.go
	both modified:   x/gamm/pool-models/stableswap/amm.go
	both modified:   x/gamm/pool-models/stableswap/amm_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

* Move binary search from osmomath to osmoutils

* Add changelog

(cherry picked from commit 3095a7d)

# Conflicts:
#	osmomath/binary_search.go
#	x/gamm/pool-models/balancer/pool_test.go
#	x/gamm/pool-models/internal/cfmm_common/lp.go
#	x/gamm/pool-models/stableswap/amm.go
#	x/gamm/pool-models/stableswap/amm_test.go
@mergify mergify bot added the conflicts label Dec 16, 2022
@github-actions github-actions bot added the C:x/gamm Changes, features and bugs related to the gamm module. label Dec 16, 2022
@ValarDragon ValarDragon merged commit b8a6309 into v13.x Dec 16, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v13.x/pr-3763 branch December 16, 2022 20:41
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
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant