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: rename GenTx to GenSignedMockTx to avoid confusion with genutil/GenTx (backport #11696) #11702

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 20, 2022

This is an automatic backport of pull request #11696 done by Mergify.
Cherry-pick of 1a9654f has failed:

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

You are currently cherry-picking commit 1a9654f8f.
  (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:   simapp/helpers/test_helpers.go
	modified:   simapp/test_helpers.go
	modified:   x/authz/simulation/operations.go
	modified:   x/bank/simulation/operations.go
	modified:   x/genutil/gentx_test.go
	modified:   x/gov/simulation/operations.go
	modified:   x/simulation/util.go
	modified:   x/slashing/simulation/operations.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   x/group/simulation/operations.go
	deleted by us:   x/nft/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

… genutil/GenTx (#11696)

(cherry picked from commit 1a9654f)

# Conflicts:
#	CHANGELOG.md
#	x/group/simulation/operations.go
#	x/nft/simulation/operations.go
@alexanderbez
Copy link
Contributor

This is actually a breaking change. Closing.

@alexanderbez alexanderbez deleted the mergify/bp/release/v0.44.x/pr-11696 branch April 20, 2022 15:36
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.

2 participants