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

Delete unused simulator code (backport #1671) #2158

Merged
merged 3 commits into from
Jul 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 19, 2022

This is an automatic backport of pull request #1671 done by Mergify.
Cherry-pick of f21e29e has failed:

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

You are currently cherry-picking commit f21e29eb.
  (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:   app/modules.go
	modified:   x/epochs/keeper/epoch_test.go
	modified:   x/epochs/keeper/genesis_test.go
	modified:   x/epochs/keeper/grpc_query_test.go
	modified:   x/epochs/types/genesis.go
	modified:   x/mint/module.go
	deleted:    x/mint/simulation/params.go
	modified:   x/tokenfactory/module.go
	modified:   x/txfees/module.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/epochs/module.go
	deleted by them: x/epochs/simulation/genesis.go
	both modified:   x/gamm/module.go
	deleted by them: x/gamm/simulation/operations.go
	deleted by them: x/mint/simulation/params_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

* Delete unused simulator code

* Add hourly epochs to the x/epochs DefaultGenesis

* Add changelog

* Delete the unused x/gamm/simulation folder

* Fix epochs module tests for updated DefaultGenesis

(cherry picked from commit f21e29e)

# Conflicts:
#	CHANGELOG.md
#	x/epochs/module.go
#	x/epochs/simulation/genesis.go
#	x/gamm/module.go
#	x/gamm/simulation/operations.go
#	x/mint/simulation/params_test.go
@mergify mergify bot requested a review from a team July 19, 2022 22:43
@mergify mergify bot added the conflicts label Jul 19, 2022
@github-actions github-actions bot added C:x/epochs C:x/gamm Changes, features and bugs related to the gamm module. C:x/mint C:x/txfees labels Jul 19, 2022
Copy link
Member

@p0mvn p0mvn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once changelog is resolved

CHANGELOG.md Outdated
@@ -70,6 +70,12 @@ This release contains minor CLI bug fixes.

* [#1699](https://github.com/osmosis-labs/osmosis/pull/1699) Fixes bug in sig fig rounding on spot price queries for small values

<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there might be a conflict in changelog.

Everything else LGTM!

@ValarDragon ValarDragon merged commit fc3ad6e into v10.x Jul 20, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v10.x/pr-1671 branch July 20, 2022 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/epochs C:x/gamm Changes, features and bugs related to the gamm module. C:x/mint C:x/txfees conflicts
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants