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 osmoassert into osmoutils, remove osmoutils twap dependence (backport #3817) #3819

Merged
merged 2 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 #3817 done by Mergify.
Cherry-pick of 4f04e73 has failed:

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

You are currently cherry-picking commit 4f04e735.
  (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:   osmoutils/module_account_test.go
	renamed:    app/apptesting/osmoassert/assertions.go -> osmoutils/osmoassert/assertions.go
	modified:   osmoutils/store_helper_test.go
	modified:   tests/e2e/e2e_test.go
	modified:   x/gamm/keeper/pool_service_test.go
	modified:   x/gamm/pool-models/balancer/pool_suite_test.go
	modified:   x/gamm/pool-models/balancer/pool_test.go
	modified:   x/gamm/pool-models/stableswap/amm_test.go
	modified:   x/gamm/pool-models/stableswap/pool_test.go
	modified:   x/mint/keeper/genesis_test.go
	modified:   x/mint/keeper/hooks_test.go
	modified:   x/mint/keeper/keeper_test.go
	modified:   x/twap/keeper_test.go
	modified:   x/twap/types/utils_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/twap/logic_test.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 osmoassert into osmoutils

* Remove twaptypes dependence

* Add changelog

(cherry picked from commit 4f04e73)

# Conflicts:
#	CHANGELOG.md
#	x/twap/logic_test.go
#	x/twap/strategy_test.go
@mergify mergify bot added the conflicts label Dec 21, 2022
@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. C:x/mint C:x/twap Changes to the twap module labels Dec 21, 2022
@ValarDragon ValarDragon merged commit fe9a701 into v13.x Dec 21, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v13.x/pr-3817 branch December 21, 2022 23:32
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. C:x/mint C:x/twap Changes to the twap module conflicts
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant