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

fix: Simulation is not deterministic due to GenSignedMockTx (backport #12374) #12412

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2022

This is an automatic backport of pull request #12374 done by Mergify.
Cherry-pick of 17dc431 has failed:

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

You are currently cherry-picking commit 17dc43166.
  (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:   x/distribution/simulation/operations.go
	modified:   x/staking/simulation/operations.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   simapp/helpers/test_helpers.go
	both modified:   simapp/test_helpers.go
	both modified:   x/authz/simulation/operations.go
	both modified:   x/bank/simulation/operations.go
	both modified:   x/genutil/gentx_test.go
	both modified:   x/gov/simulation/operations.go
	deleted by us:   x/group/simulation/operations.go
	deleted by us:   x/nft/simulation/operations.go
	both modified:   x/simulation/util.go
	both modified:   x/slashing/simulation/operations.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 17dc431)

# Conflicts:
#	CHANGELOG.md
#	simapp/helpers/test_helpers.go
#	simapp/test_helpers.go
#	x/authz/simulation/operations.go
#	x/bank/simulation/operations.go
#	x/genutil/gentx_test.go
#	x/gov/simulation/operations.go
#	x/group/simulation/operations.go
#	x/nft/simulation/operations.go
#	x/simulation/util.go
#	x/slashing/simulation/operations.go
@alexanderbez
Copy link
Contributor

@Muggle-Du do you think you could address merge conflicts here?

@alexanderbez alexanderbez self-assigned this Jul 1, 2022
@adu-web3
Copy link
Contributor

adu-web3 commented Jul 3, 2022

@Muggle-Du do you think you could address merge conflicts here?

@alexanderbez sure, I can handle this

@adu-web3
Copy link
Contributor

adu-web3 commented Jul 4, 2022

@alexanderbez but it seems I have no permissions to commit to mergify/bp/release/v0.45.x/pr-12374, can you help me with this?

@mergify mergify bot deleted the mergify/bp/release/v0.45.x/pr-12374 branch July 4, 2022 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants