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: correct path required proto testdata (backport #14991) #16083

Merged
merged 5 commits into from
May 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2023

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

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

You are currently cherry-picking commit a90569c7e.
  (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:   Makefile
	modified:   api/cosmos/orm/v1/orm.pulsar.go
	modified:   baseapp/abci_test.go
	modified:   baseapp/block_gas_test.go
	modified:   baseapp/grpcrouter_test.go
	modified:   baseapp/testutil/messages.pb.go
	modified:   baseapp/testutil/messages.proto
	modified:   client/context_test.go
	modified:   codec/types/types_test.go
	modified:   codec/unknownproto/unknown_fields_test.go
	modified:   codec/yaml_test.go
	new file:   testutil/testdata/README.md
	modified:   testutil/testdata/buf.gen.pulsar.yaml
	modified:   testutil/testdata/buf.gen.yaml
	modified:   testutil/testdata/codec.go
	modified:   testutil/testdata/query.pb.go
	modified:   testutil/testdata/testdata.pb.go
	renamed:    testutil/testdata/query.proto -> testutil/testdata/testpb/query.proto
	renamed:    testutil/testdata_pulsar/query.pulsar.go -> testutil/testdata/testpb/query.pulsar.go
	renamed:    testutil/testdata/testdata.proto -> testutil/testdata/testpb/testdata.proto
	renamed:    testutil/testdata_pulsar/testdata.pulsar.go -> testutil/testdata/testpb/testdata.pulsar.go
	renamed:    testutil/testdata/tx.proto -> testutil/testdata/testpb/tx.proto
	renamed:    testutil/testdata_pulsar/tx.pulsar.go -> testutil/testdata/testpb/tx.pulsar.go
	renamed:    testutil/testdata/unknonwnproto.proto -> testutil/testdata/testpb/unknonwnproto.proto
	renamed:    testutil/testdata_pulsar/unknonwnproto.pulsar.go -> testutil/testdata/testpb/unknonwnproto.pulsar.go
	modified:   testutil/testdata/tx.pb.go
	modified:   testutil/testdata/unknonwnproto.pb.go
	deleted:    testutil/testdata_pulsar/query.go
	deleted:    testutil/testdata_pulsar/query_grpc.pb.go
	deleted:    testutil/testdata_pulsar/tx_grpc.pb.go
	modified:   types/tx_msg_test.go
	modified:   x/auth/tx/encode_decode_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .golangci.yml
	both modified:   CHANGELOG.md
	both modified:   simapp/app.go
	both modified:   simapp/app_v2.go
	deleted by us:   testutil/assert_helpers.go
	both modified:   testutil/testdata/testpb/pulsar_query.go
	both modified:   testutil/testdata/testpb/query_grpc.pb.go
	both modified:   testutil/testdata/testpb/tx_grpc.pb.go
	both modified:   x/auth/ante/testutil_test.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 a90569c)

# Conflicts:
#	.golangci.yml
#	CHANGELOG.md
#	simapp/app.go
#	simapp/app_v2.go
#	testutil/assert_helpers.go
#	testutil/testdata/testpb/pulsar_query.go
#	testutil/testdata/testpb/query_grpc.pb.go
#	testutil/testdata/testpb/tx_grpc.pb.go
#	x/auth/ante/testutil_test.go
@julienrbrt
Copy link
Member

fixing the conflict here. ref #16030

@julienrbrt julienrbrt removed their assignment May 10, 2023
@julienrbrt julienrbrt requested review from a team, mark-rushakoff and facundomedica and removed request for a team May 10, 2023 15:01
@tac0turtle tac0turtle merged commit fdb9fbe into release/v0.47.x May 10, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-14991 branch May 10, 2023 16:38
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
kakysha pushed a commit to InjectiveLabs/cosmos-sdk that referenced this pull request Aug 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants