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) #12403

Merged
merged 2 commits into from
Jul 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 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.46.x/pr-12374
Your branch is up to date with 'origin/release/v0.46.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 <file>..." 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
	both modified:   x/group/simulation/operations.go
	both modified:   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

@alexanderbez
Copy link
Contributor

@Muggle-Du do you think you could help address the merge conflicts here from backporting #12374?

@julienrbrt
Copy link
Member

@Mergifyio rebase

(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
@mergify
Copy link
Contributor Author

mergify bot commented Jul 14, 2022

rebase

✅ Branch has been successfully rebased

@likhita-809 likhita-809 force-pushed the mergify/bp/release/v0.46.x/pr-12374 branch from c494b87 to 0295da5 Compare July 14, 2022 16:49
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

Merge conflicts need to be addressed :)

@adu-crypto
Copy link
Contributor

@Muggle-Du do you think you could help address the merge conflicts here from backporting #12374?

sorry for missing this msg, I can help with this

@julienrbrt
Copy link
Member

julienrbrt commented Jul 14, 2022

I can do it otherwise, that's why I was assigned to the PR.

@alexanderbez alexanderbez merged commit 93af9e8 into release/v0.46.x Jul 14, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.46.x/pr-12374 branch July 14, 2022 19:12
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.

4 participants