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: Simplify SimulationManager setup (backport #12153) #12159

Merged
merged 3 commits into from
Jun 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2022

This is an automatic backport of pull request #12153 done by Mergify.
Cherry-pick of 544afb6 has failed:

On branch mergify/bp/release/v0.45.x/pr-12153
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit 544afb65e.
  (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:   types/module/simulation.go

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

(cherry picked from commit 544afb6)

# Conflicts:
#	CHANGELOG.md
#	simapp/app.go
@mergify mergify bot requested review from aaronc and alexanderbez as code owners June 6, 2022 13:18
@mergify mergify bot added the conflicts label Jun 6, 2022
@tac0turtle
Copy link
Member

id rather not backport api breaking changes with 0.46 right around the corner

@robert-zaremba
Copy link
Collaborator

This is not API breaking

Copy link
Member

@tac0turtle tac0turtle left a comment

Choose a reason for hiding this comment

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

ah true, missed the variable change

@tac0turtle tac0turtle merged commit d721a76 into release/v0.45.x Jun 7, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-12153 branch June 7, 2022 11:40
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
…osmos#12159)

* refactor: Simplify SimulationManager setup (cosmos#12153)

(cherry picked from commit 544afb6)

# Conflicts:
#	CHANGELOG.md
#	simapp/app.go

* fix conflict

* fix conflict

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
p0mvn pushed a commit to osmosis-labs/cosmos-sdk that referenced this pull request Oct 13, 2022
…osmos#12159)

* refactor: Simplify SimulationManager setup (cosmos#12153)

(cherry picked from commit 544afb6)

* fix conflict

* fix conflict

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
mattverse pushed a commit to osmosis-labs/cosmos-sdk that referenced this pull request Oct 13, 2022
…osmos#12159) (#358)

* refactor: Simplify SimulationManager setup (cosmos#12153)

(cherry picked from commit 544afb6)

* fix conflict

* fix conflict

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…osmos#12159)

* refactor: Simplify SimulationManager setup (cosmos#12153)

(cherry picked from commit 544afb6)

# Conflicts:
#	CHANGELOG.md
#	simapp/app.go

* fix conflict

* fix conflict

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants