Add ADR 031 BaseApp and codec infrastructure

baseapp/baseapp_test.go

@@ -1692,9 +1692,9 @@ func TestQuery(t *testing.T) {
 
 func TestGRPCQuery(t *testing.T) {
 	grpcQueryOpt := func(bapp *BaseApp) {
-		testdata.RegisterTestServiceServer(
+		testdata.RegisterQueryServer(
 			bapp.GRPCQueryRouter(),
-			testdata.TestServiceImpl{},
+			testdata.QueryImpl{},
 		)
 	}
 
@@ -1711,7 +1711,7 @@ func TestGRPCQuery(t *testing.T) {
 
 	reqQuery := abci.RequestQuery{
 		Data: reqBz,
-		Path: "/testdata.TestService/SayHello",
+		Path: "/testdata.Query/SayHello",
 	}
 
 	resQuery := app.Query(reqQuery)

baseapp/grpcrouter_test.go

@@ -15,12 +15,12 @@ func TestGRPCRouter(t *testing.T) {
 	qr := NewGRPCQueryRouter()
 	interfaceRegistry := testdata.NewTestInterfaceRegistry()
 	qr.SetInterfaceRegistry(interfaceRegistry)
-	testdata.RegisterTestServiceServer(qr, testdata.TestServiceImpl{})
+	testdata.RegisterQueryServer(qr, testdata.QueryImpl{})
 	helper := &QueryServiceTestHelper{
 		GRPCQueryRouter: qr,
 		ctx:             sdk.Context{}.WithContext(context.Background()),
 	}
-	client := testdata.NewTestServiceClient(helper)
+	client := testdata.NewQueryClient(helper)
 
 	res, err := client.Echo(context.Background(), &testdata.EchoRequest{Message: "hello"})
 	require.Nil(t, err)

baseapp/msg_service.go

@@ -0,0 +1,8 @@
+package baseapp
+
+type MsgServiceRouter struct{}
+
+// NewMsgServiceRouter creates a new MsgServiceRouter.
+func NewMsgServiceRouter() *MsgServiceRouter {
+	return &MsgServiceRouter{}
+}

baseapp/msg_service_test.go

@@ -0,0 +1,9 @@
+package baseapp
+
+import (
+	"testing"
+)
+
+func TestMsgService(t *testing.T) {
+	// TODO
+}

client/context_test.go

@@ -108,7 +108,7 @@ func TestCLIQueryConn(t *testing.T) {
 	n := network.New(t, cfg)
 	defer n.Cleanup()
 
-	testClient := testdata.NewTestServiceClient(n.Validators[0].ClientCtx)
+	testClient := testdata.NewQueryClient(n.Validators[0].ClientCtx)
 	res, err := testClient.Echo(context.Background(), &testdata.EchoRequest{Message: "hello"})
 	require.NoError(t, err)
 	require.Equal(t, "hello", res.Message)

client/grpc_query_test.go

@@ -43,7 +43,7 @@ func (s *IntegrationTestSuite) TestGRPCQuery() {
 	val0 := s.network.Validators[0]
 
 	// gRPC query to test service should work
-	testClient := testdata.NewTestServiceClient(val0.ClientCtx)
+	testClient := testdata.NewQueryClient(val0.ClientCtx)
 	testRes, err := testClient.Echo(context.Background(), &testdata.EchoRequest{Message: "hello"})
 	s.Require().NoError(err)
 	s.Require().Equal("hello", testRes.Message)

scripts/protocgen.sh

@@ -22,7 +22,7 @@ done
 
 # generate codec/testdata proto code
 protoc -I "proto" -I "third_party/proto" -I "testutil/testdata" --gocosmos_out=plugins=interfacetype+grpc,\
-Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. ./testutil/testdata/proto.proto
+Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. ./testutil/testdata/*.proto
 
 # move proto files to the right places
 cp -r github.com/cosmos/cosmos-sdk/* ./

server/grpc/server_test.go

@@ -50,7 +50,7 @@ func (s *IntegrationTestSuite) TestGRPCServer() {
 	s.Require().NoError(err)
 
 	// gRPC query to test service should work
-	testClient := testdata.NewTestServiceClient(conn)
+	testClient := testdata.NewQueryClient(conn)
 	testRes, err := testClient.Echo(context.Background(), &testdata.EchoRequest{Message: "hello"})
 	s.Require().NoError(err)
 	s.Require().Equal("hello", testRes.Message)

simapp/app.go

@@ -362,7 +362,7 @@ func NewSimApp(
 	app.mm.RegisterServices(module.NewConfigurator(app.GRPCQueryRouter()))
 
 	// add test gRPC service for testing gRPC queries in isolation
-	testdata.RegisterTestServiceServer(app.GRPCQueryRouter(), testdata.TestServiceImpl{})
+	testdata.RegisterQueryServer(app.GRPCQueryRouter(), testdata.QueryImpl{})
 
 	// create the simulation manager and define the order of the modules for deterministic simulations
 	//

testutil/testdata/test_service.go → testutil/testdata/grpc_query.go

@@ -9,9 +9,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/types"
 )
 
-type TestServiceImpl struct{}
+type QueryImpl struct{}
 
-func (e TestServiceImpl) TestAny(_ context.Context, request *TestAnyRequest) (*TestAnyResponse, error) {
+var _ QueryServer = QueryImpl{}
+
+func (e QueryImpl) TestAny(_ context.Context, request *TestAnyRequest) (*TestAnyResponse, error) {
 	animal, ok := request.AnyAnimal.GetCachedValue().(Animal)
 	if !ok {
 		return nil, fmt.Errorf("expected Animal")
@@ -28,17 +30,15 @@ func (e TestServiceImpl) TestAny(_ context.Context, request *TestAnyRequest) (*T
 	}}, nil
 }
 
-func (e TestServiceImpl) Echo(_ context.Context, req *EchoRequest) (*EchoResponse, error) {
+func (e QueryImpl) Echo(_ context.Context, req *EchoRequest) (*EchoResponse, error) {
 	return &EchoResponse{Message: req.Message}, nil
 }
 
-func (e TestServiceImpl) SayHello(_ context.Context, request *SayHelloRequest) (*SayHelloResponse, error) {
+func (e QueryImpl) SayHello(_ context.Context, request *SayHelloRequest) (*SayHelloResponse, error) {
 	greeting := fmt.Sprintf("Hello %s!", request.Name)
 	return &SayHelloResponse{Greeting: greeting}, nil
 }
 
-var _ TestServiceServer = TestServiceImpl{}
-
 var _ types.UnpackInterfacesMessage = &TestAnyRequest{}
 
 func (m *TestAnyRequest) UnpackInterfaces(unpacker types.AnyUnpacker) error {

testutil/testdata/msg_service.go

@@ -0,0 +1,16 @@
+package testdata
+
+import (
+	"context"
+)
+
+type MsgImpl struct{}
+
+var _ MsgServer = MsgImpl{}
+
+// CreateDog implements the MsgServer interface.
+func (m MsgImpl) CreateDog(_ context.Context, msg *MsgCreateDog) (*MsgCreateDogResponse, error) {
+	return &MsgCreateDogResponse{
+		Name: msg.Dog.Name,
+	}, nil
+}