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

chore: rename SubmitTx to SendTx (backport #2255) #2262

Merged
merged 6 commits into from
Sep 16, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 9, 2022

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

On branch mergify/bp/release/v6.0.x/pr-2255
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit a4be561.
  (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:   modules/apps/27-interchain-accounts/controller/client/cli/tx.go
	modified:   modules/apps/27-interchain-accounts/controller/types/msgs.go
	modified:   modules/apps/27-interchain-accounts/controller/types/msgs_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/ibc/proto-docs.md
	both modified:   modules/apps/27-interchain-accounts/controller/client/cli/cli.go
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go
	both modified:   modules/apps/27-interchain-accounts/controller/types/codec.go
	both modified:   modules/apps/27-interchain-accounts/controller/types/tx.pb.go
	both modified:   proto/ibc/applications/interchain_accounts/controller/v1/tx.proto

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

* updating naming of submit tx to send tx

* use struct embedding

(cherry picked from commit a4be561)

# Conflicts:
#	docs/ibc/proto-docs.md
#	modules/apps/27-interchain-accounts/controller/client/cli/cli.go
#	modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
#	modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go
#	modules/apps/27-interchain-accounts/controller/types/codec.go
#	modules/apps/27-interchain-accounts/controller/types/tx.pb.go
#	proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@lgtm-com
Copy link

lgtm-com bot commented Sep 9, 2022

This pull request introduces 1 alert when merging c220bbc into 9e9f267 - view on LGTM.com

new alerts:

  • 1 for Unreachable statement

# Conflicts:
#	docs/ibc/proto-docs.md
#	modules/apps/27-interchain-accounts/controller/client/cli/cli.go
#	modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
#	modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go
#	modules/apps/27-interchain-accounts/controller/types/codec.go
#	modules/apps/27-interchain-accounts/controller/types/tx.pb.go
#	proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
@crodriguezvega crodriguezvega merged commit 1b103bd into release/v6.0.x Sep 16, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v6.0.x/pr-2255 branch September 16, 2022 11:36
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.

3 participants