Fix testdata proto-gen (cosmos#6568)

akash-network · Jul 1, 2020 · 99ea4b7 · 99ea4b7
1 parent 0f0723d
commit 99ea4b7
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 64 deletions.
diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go
@@ -1555,7 +1555,7 @@ func TestGRPCQuery(t *testing.T) {
 
 	reqQuery := abci.RequestQuery{
 		Data: reqBz,
-		Path: "/cosmos_sdk.codec.v1.TestService/SayHello",
+		Path: "/testdata.TestService/SayHello",
 	}
 
 	resQuery := app.Query(reqQuery)

diff --git a/client/context_test.go b/client/context_test.go
@@ -109,7 +109,7 @@ func TestContext_PrintOutput(t *testing.T) {
 	err = ctx.PrintOutput(hasAnimal)
 	require.NoError(t, err)
 	require.Equal(t,
-		`{"animal":{"@type":"/cosmos_sdk.codec.v1.Dog","size":"big","name":"Spot"},"x":"10"}
+		`{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"}
 `, string(buf.Bytes()))
 
 	// yaml
@@ -120,7 +120,7 @@ func TestContext_PrintOutput(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t,
 		`animal:
-  '@type': /cosmos_sdk.codec.v1.Dog
+  '@type': /testdata.Dog
   name: Spot
   size: big
 x: "10"

diff --git a/codec/testdata/proto.pb.go b/codec/testdata/proto.pb.go
diff --git a/codec/testdata/proto.proto b/codec/testdata/proto.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package cosmos_sdk.codec.v1;
+package testdata;
 
 import "google/protobuf/any.proto";
 

diff --git a/codec/types/types_test.go b/codec/types/types_test.go
@@ -124,7 +124,7 @@ func TestAny_ProtoJSON(t *testing.T) {
 	jm := &jsonpb.Marshaler{}
 	json, err := jm.MarshalToString(any)
 	require.NoError(t, err)
-	require.Equal(t, "{\"@type\":\"/cosmos_sdk.codec.v1.Dog\",\"name\":\"Spot\"}", json)
+	require.Equal(t, "{\"@type\":\"/testdata.Dog\",\"name\":\"Spot\"}", json)
 
 	registry := testdata.NewTestInterfaceRegistry()
 	jum := &jsonpb.Unmarshaler{}
@@ -143,7 +143,7 @@ func TestAny_ProtoJSON(t *testing.T) {
 	require.NoError(t, err)
 	json, err = jm.MarshalToString(ha)
 	require.NoError(t, err)
-	require.Equal(t, "{\"animal\":{\"@type\":\"/cosmos_sdk.codec.v1.Dog\",\"name\":\"Spot\"}}", json)
+	require.Equal(t, "{\"animal\":{\"@type\":\"/testdata.Dog\",\"name\":\"Spot\"}}", json)
 
 	require.NoError(t, err)
 	var ha2 testdata.HasAnimal

diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -12,5 +12,12 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
   $(find "${dir}" -maxdepth 1 -name '*.proto')
 done
 
+# generate codec/testdata proto code
+protoc -I "proto" -I "third_party/proto" -I "codec/testdata" --gocosmos_out=plugins=interfacetype+grpc,\
+Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. ./codec/testdata/proto.proto
+
+# move proto files to the right places
 cp -r github.com/cosmos/cosmos-sdk/* ./
 rm -rf github.com
+
+