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: refactor genesis types to separate directory, mv controller interfaces registration to module.go (backport #2133) #2141

Merged
merged 3 commits into from
Aug 31, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2022

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

On branch mergify/bp/release/v5.1.x/pr-2133
Your branch is up to date with 'origin/release/v5.1.x'.

You are currently cherry-picking commit f8f879b.
  (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:   docs/ibc/proto-docs.md
	modified:   modules/apps/27-interchain-accounts/controller/keeper/genesis.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
	renamed:    modules/apps/27-interchain-accounts/types/genesis.go -> modules/apps/27-interchain-accounts/genesis/types/genesis.go
	renamed:    modules/apps/27-interchain-accounts/types/genesis.pb.go -> modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
	renamed:    modules/apps/27-interchain-accounts/types/genesis_test.go -> modules/apps/27-interchain-accounts/genesis/types/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/genesis.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/keeper_test.go
	modified:   modules/apps/27-interchain-accounts/module.go
	modified:   modules/apps/27-interchain-accounts/types/codec.go
	renamed:    proto/ibc/applications/interchain_accounts/v1/genesis.proto -> proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

…terfaces registration to module.go (#2133)

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit f8f879b)

# Conflicts:
#	CHANGELOG.md
@colin-axner colin-axner removed their assignment Aug 30, 2022
Copy link
Member

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

Thanks for handling conflicts on this one! <3

@colin-axner colin-axner merged commit 23c0ba4 into release/v5.1.x Aug 31, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v5.1.x/pr-2133 branch August 31, 2022 13:55
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