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: Clean up {accept,implement}_interface (backport #14476) #14478

Merged
merged 10 commits into from
Jan 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2023

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

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

You are currently cherry-picking commit b244ffb4d.
  (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:   UPGRADING.md
	modified:   api/cosmos/auth/v1beta1/query.pulsar.go
	modified:   api/cosmos/authz/v1beta1/authz.pulsar.go
	modified:   api/cosmos/authz/v1beta1/tx.pulsar.go
	modified:   api/cosmos/bank/v1beta1/authz.pulsar.go
	modified:   api/cosmos/evidence/v1beta1/tx.pulsar.go
	modified:   api/cosmos/feegrant/v1beta1/feegrant.pulsar.go
	modified:   api/cosmos/feegrant/v1beta1/tx.pulsar.go
	modified:   api/cosmos/gov/v1/tx.pulsar.go
	modified:   api/cosmos/group/v1/types.pulsar.go
	modified:   api/cosmos/staking/v1beta1/authz.pulsar.go
	new file:   cosmos/circuit/v1/tx.pb.go
	modified:   docs/architecture/adr-030-authz-module.md
	modified:   docs/architecture/adr-042-group-module.md
	modified:   docs/architecture/adr-050-sign-mode-textual.md
	modified:   docs/docs/core/05-encoding.md
	modified:   proto/cosmos/auth/v1beta1/query.proto
	modified:   proto/cosmos/authz/v1beta1/authz.proto
	modified:   proto/cosmos/authz/v1beta1/tx.proto
	modified:   proto/cosmos/bank/v1beta1/authz.proto
	modified:   proto/cosmos/bank/v1beta1/bank.proto
	modified:   proto/cosmos/feegrant/v1beta1/feegrant.proto
	modified:   proto/cosmos/feegrant/v1beta1/tx.proto
	modified:   proto/cosmos/gov/v1/tx.proto
	modified:   proto/cosmos/group/v1/types.proto
	modified:   proto/cosmos/staking/v1beta1/authz.proto
	modified:   x/auth/types/query.pb.go
	modified:   x/authz/authz.pb.go
	modified:   x/authz/codec.go
	modified:   x/authz/tx.pb.go
	modified:   x/bank/types/authz.pb.go
	modified:   x/evidence/types/tx.pb.go
	modified:   x/feegrant/feegrant.pb.go
	modified:   x/feegrant/tx.pb.go
	modified:   x/gov/types/v1/tx.pb.go
	modified:   x/group/types.pb.go
	modified:   x/staking/types/authz.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   api/cosmos/auth/v1beta1/auth.pulsar.go
	both modified:   api/cosmos/bank/v1beta1/bank.pulsar.go
	both modified:   api/cosmos/gov/v1beta1/gov.pulsar.go
	both modified:   api/cosmos/gov/v1beta1/tx.pulsar.go
	both modified:   proto/cosmos/auth/v1beta1/auth.proto
	both modified:   proto/cosmos/evidence/v1beta1/tx.proto
	both modified:   proto/cosmos/gov/v1beta1/gov.proto
	both modified:   proto/cosmos/gov/v1beta1/tx.proto
	both modified:   x/auth/types/auth.pb.go
	both modified:   x/bank/types/bank.pb.go
	both modified:   x/gov/types/v1beta1/gov.pb.go
	both modified:   x/gov/types/v1beta1/tx.pb.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 b244ffb)

# Conflicts:
#	CHANGELOG.md
#	api/cosmos/auth/v1beta1/auth.pulsar.go
#	api/cosmos/bank/v1beta1/bank.pulsar.go
#	api/cosmos/gov/v1beta1/gov.pulsar.go
#	api/cosmos/gov/v1beta1/tx.pulsar.go
#	proto/cosmos/auth/v1beta1/auth.proto
#	proto/cosmos/evidence/v1beta1/tx.proto
#	proto/cosmos/gov/v1beta1/gov.proto
#	proto/cosmos/gov/v1beta1/tx.proto
#	x/auth/types/auth.pb.go
#	x/bank/types/bank.pb.go
#	x/gov/types/v1beta1/gov.pb.go
#	x/gov/types/v1beta1/tx.pb.go
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

Thanks @tac0turtle!

@@ -74,6 +74,31 @@ This allows you to remove the replace directive `replace github.com/gogo/protobu

Please use the `ghcr.io/cosmos/proto-builder` image (version >= `0.11.0`) for generating protobuf files.

#### `{accepts,implements}_interface` proto annotations
Copy link
Contributor

Choose a reason for hiding this comment

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

The changelog entry got removed

CHANGELOG.md Outdated Show resolved Hide resolved
@tac0turtle tac0turtle merged commit 22e8aaa into release/v0.47.x Jan 4, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-14476 branch January 4, 2023 17:33
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.

3 participants