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 osmomath into its own go.mod (backport #3771) #3816

Merged
merged 6 commits into from
Dec 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2022

This is an automatic backport of pull request #3771 done by Mergify.
Cherry-pick of 079702e has failed:

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

You are currently cherry-picking commit 079702ea.
  (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:   Makefile
	modified:   app/apptesting/gamm.go
	new file:   go.work
	new file:   go.work.sum
	new file:   osmomath/go.mod
	new file:   osmomath/go.sum
	modified:   x/gamm/pool-models/balancer/amm.go
	modified:   x/gamm/pool-models/balancer/pool_test.go
	modified:   x/gamm/pool-models/balancer/util_test.go
	modified:   x/gamm/pool-models/internal/cfmm_common/lp.go
	modified:   x/gamm/pool-models/internal/test_helpers/test_helpers.go
	modified:   x/gamm/pool-models/stableswap/amm.go
	modified:   x/gamm/pool-models/stableswap/amm_bench_test.go
	modified:   x/gamm/pool-models/stableswap/amm_test.go
	modified:   x/gamm/pool-models/stableswap/pool.go
	modified:   x/twap/logic_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmomath/decimal_test.go
	deleted by us:   osmomath/exp2_test.go
	both modified:   x/gamm/keeper/pool_service.go
	both modified:   x/gamm/pool-models/stableswap/pool_test.go
	both modified:   x/twap/logic.go
	deleted by us:   x/twap/strategy.go
	deleted by us:   x/twap/strategy_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 osmomath into its own go.mod

* Fix go mods

* fix osmomath test build

* Tryfix e2e test

* Try removing osmomath from the copy line?

* Add osmomath to first copy

* Try another layer

* Make build work off of tagged releases

* Switch prod and E2E builds to ignore go work

* Fix merge conflict

* Add root dir to go work

* Fix conflict

(cherry picked from commit 079702e)

# Conflicts:
#	go.mod
#	go.sum
#	osmomath/decimal_test.go
#	osmomath/exp2_test.go
#	x/gamm/keeper/pool_service.go
#	x/gamm/pool-models/stableswap/pool_test.go
#	x/twap/logic.go
#	x/twap/strategy.go
#	x/twap/strategy_test.go
@mergify mergify bot added the conflicts label Dec 21, 2022
@github-actions github-actions bot added C:app-wiring Changes to the app folder C:x/gamm Changes, features and bugs related to the gamm module. C:x/twap Changes to the twap module T:build labels Dec 21, 2022
@github-actions github-actions bot removed the C:x/twap Changes to the twap module label Dec 21, 2022
ValarDragon and others added 3 commits December 21, 2022 15:20
…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
@ValarDragon ValarDragon merged commit 9b03d09 into v13.x Dec 21, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v13.x/pr-3771 branch December 21, 2022 22:31
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/gamm Changes, features and bugs related to the gamm module. conflicts T:build
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants