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(reflection): Fix gogoproto import paths (backport #14838) #14851

Merged
merged 5 commits into from
Jan 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2023

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

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

You are currently cherry-picking commit d0a5bd1a0.
  (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:   go.sum
	modified:   server/grpc/gogoreflection/fix_registration.go
	modified:   simapp/go.mod
	modified:   simapp/go.sum
	modified:   tests/go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   api/go.mod
	both modified:   api/go.sum
	both modified:   go.mod
	deleted by us:   store/go.mod
	deleted by us:   store/go.sum
	both modified:   tests/go.mod
	deleted by us:   x/circuit/go.mod
	deleted by us:   x/circuit/go.sum
	deleted by us:   x/evidence/go.mod
	deleted by us:   x/evidence/go.sum
	deleted by us:   x/feegrant/go.mod
	deleted by us:   x/feegrant/go.sum
	deleted by us:   x/nft/go.mod
	deleted by us:   x/nft/go.sum
	deleted by us:   x/upgrade/go.mod
	deleted by us:   x/upgrade/go.sum

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 d0a5bd1)

# Conflicts:
#	api/go.mod
#	api/go.sum
#	go.mod
#	store/go.mod
#	store/go.sum
#	tests/go.mod
#	x/circuit/go.mod
#	x/circuit/go.sum
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/feegrant/go.mod
#	x/feegrant/go.sum
#	x/nft/go.mod
#	x/nft/go.sum
#	x/upgrade/go.mod
#	x/upgrade/go.sum
@amaury1093
Copy link
Contributor

amaury1093 commented Jan 31, 2023

I'll fix conflicts here

Edit: done

@@ -61,6 +61,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (types/coin) [#14715](https://github.com/cosmos/cosmos-sdk/pull/14715) `sdk.Coins.Add` now returns an empty set of coins `sdk.Coins{}` if both coins set are empty.
* This is a behavior change, as previously `sdk.Coins.Add` would return `nil` in this case.
* (reflection) [#14838](https://github.com/cosmos/cosmos-sdk/pull/14838) We now require that all proto files' import path (i.e. the OS path) matches their fully-qualified package name. For example, proto files with package name `cosmos.my.pkg.v1` should live in the folder `cosmos/my/pkg/v1/*.proto`.
Copy link
Contributor

Choose a reason for hiding this comment

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

I added a changelog entry. @julienrbrt I think this needs an UPGRADING.md entry TBH, or else if app devs don't do this, they'll see an error, and it's not so obvious. I can work on that in a follow-up.

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense 👍🏾

@julienrbrt julienrbrt enabled auto-merge (squash) January 31, 2023 12:05
@julienrbrt julienrbrt merged commit 16dd736 into release/v0.47.x Jan 31, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14838 branch January 31, 2023 12:28
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