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(osmoutils): use Dec for additive tolerance instead of Int (backport #3711) #3818

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2022

This is an automatic backport of pull request #3711 done by Mergify.
Cherry-pick of 5ab7ebf has failed:

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

You are currently cherry-picking commit 5ab7ebf6.
  (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:   osmomath/binary_search_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	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

…3711)

* refactor(osmoutils): use Dec for additive tolerance instead of Int

* changelog

(cherry picked from commit 5ab7ebf)

# Conflicts:
#	CHANGELOG.md
#	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 21, 2022
@mergify mergify bot assigned p0mvn Dec 21, 2022
@github-actions github-actions bot added the C:x/gamm Changes, features and bugs related to the gamm module. label Dec 21, 2022
@ValarDragon ValarDragon assigned ValarDragon and unassigned p0mvn Dec 21, 2022
@ValarDragon
Copy link
Member

Cherry-picking in #3816

@mergify mergify bot deleted the mergify/bp/v13.x/pr-3711 branch December 21, 2022 22:18
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.

2 participants