refactor: bump gogoproto #19869
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -168,7 +168,7 @@ func testQueryDataRacesSameHandler(t *testing.T, makeClientConn func(*baseapp.GR | |
| qr := baseapp.NewGRPCQueryRouter() | ||
| interfaceRegistry := testdata.NewTestInterfaceRegistry() | ||
| qr.SetInterfaceRegistry(interfaceRegistry) | ||
| testdata_pulsar.RegisterQueryServer(qr, testdata_pulsar.QueryImpl{}) | ||
|
|
||
| // The goal is to invoke the router concurrently and check for any data races. | ||
| // 0. Run with: go test -race | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,4 @@ version: v1 | |
| plugins: | ||
| - name: gocosmos | ||
| out: ../.. | ||
| opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any | ||
|
There was a problem hiding this comment. wanted to double check this is optional correct? chains dont have to do this as part of their upgrade? There was a problem hiding this comment. it is optional bc all public types are aliased, but could be a good idea to use the gogoproto path to not 'depend' on sdk types. But if is ok to use one or the other, I can clarify in the UPGRADING.md that this is indeed optional |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,57 +3,57 @@ package codec_test | |
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/cosmos/gogoproto/types/any/test" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil" | ||
| codectypes "github.com/cosmos/cosmos-sdk/codec/types" | ||
| "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" | ||
| cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" | ||
| "github.com/cosmos/cosmos-sdk/types/module/testutil" | ||
| ) | ||
|
|
||
| func NewTestInterfaceRegistry() codectypes.InterfaceRegistry { | ||
| registry := codectypes.NewInterfaceRegistry() | ||
| registry.RegisterInterface("Animal", (*test.Animal)(nil)) | ||
| registry.RegisterImplementations( | ||
| (*test.Animal)(nil), | ||
| &test.Dog{}, | ||
| &test.Cat{}, | ||
| ) | ||
| return registry | ||
| } | ||
|
|
||
| func TestMarshalAny(t *testing.T) { | ||
| catRegistry := codectypes.NewInterfaceRegistry() | ||
| catRegistry.RegisterImplementations((*test.Animal)(nil), &test.Cat{}) | ||
|
|
||
| registry := codectypes.NewInterfaceRegistry() | ||
|
|
||
| cdc := codec.NewProtoCodec(registry) | ||
|
|
||
| kitty := &test.Cat{Moniker: "Kitty"} | ||
| emptyBz, err := cdc.MarshalInterface(kitty) | ||
| require.ErrorContains(t, err, "does not have a registered interface") | ||
|
|
||
| catBz, err := codec.NewProtoCodec(catRegistry).MarshalInterface(kitty) | ||
| require.NoError(t, err) | ||
| require.NotEmpty(t, catBz) | ||
|
|
||
| var animal test.Animal | ||
|
|
||
| // deserializing cat bytes should error in an empty registry | ||
| err = cdc.UnmarshalInterface(catBz, &animal) | ||
| require.ErrorContains(t, err, "no registered implementations of type test.Animal") | ||
|
|
||
| // deserializing an empty byte array will return nil, but no error | ||
| err = cdc.UnmarshalInterface(emptyBz, &animal) | ||
| require.Nil(t, animal) | ||
| require.NoError(t, err) | ||
|
|
||
| // wrong type registration should fail | ||
| registry.RegisterImplementations((*test.Animal)(nil), &test.Dog{}) | ||
| err = cdc.UnmarshalInterface(catBz, &animal) | ||
| require.Error(t, err) | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is at the wrong place, should be https://github.com/cosmos/cosmos-sdk/blob/main/UPGRADING.md#protobuf. And they don't have to, we should clarify it is optional but recommended (one less sdk import)