opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from iamqizhao/master

Browse Source 
fix some comments and function names
This commit is contained in:
Qi Zhao
2015-12-18 18:35:59 -08:00
parent c414be5bc7 855235934b
commit b9a4f2b9f9
2 changed files with 14 additions and 9 deletions

2
interop/server/server.go

@ -68,6 +68,6 @@ func main() {
opts = []grpc.ServerOption{grpc.Creds(creds)} opts = []grpc.ServerOption{grpc.Creds(creds)}
} }
server := grpc.NewServer(opts...) server := grpc.NewServer(opts...)
testpb.RegisterTestServiceServer(server, &interop.TestServer{}) testpb.RegisterTestServiceServer(server, interop.NewTestServer())
server.Serve(lis) server.Serve(lis)
} }

21
interop/test_utils.go

@ -242,7 +242,7 @@ func DoEmptyStream(tc testpb.TestServiceClient) {
grpclog.Println("Emptystream done") grpclog.Println("Emptystream done")
} }
// DoTimeoutSleepingServer performs an RPC on a sleep server which causes RPC timeout. // DoTimeoutOnSleepingServer performs an RPC on a sleep server which causes RPC timeout.
func DoTimeoutOnSleepingServer(tc testpb.TestServiceClient) { func DoTimeoutOnSleepingServer(tc testpb.TestServiceClient) {
ctx, _ := context.WithTimeout(context.Background(), 1*time.Millisecond) ctx, _ := context.WithTimeout(context.Background(), 1*time.Millisecond)
stream, err := tc.FullDuplexCall(ctx) stream, err := tc.FullDuplexCall(ctx)
@ -469,10 +469,15 @@ func DoCancelAfterFirstResponse(tc testpb.TestServiceClient) {
grpclog.Println("CancelAfterFirstResponse done") grpclog.Println("CancelAfterFirstResponse done")
} }
type TestServer struct { type testServer struct {
} }
func (s *TestServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) { // NewTestServer creates a test server for test service.
func NewTestServer() testpb.TestServiceServer {
return &testServer{}
}
func (s *testServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return new(testpb.Empty), nil return new(testpb.Empty), nil
} }
@ -494,7 +499,7 @@ func serverNewPayload(t testpb.PayloadType, size int32) (*testpb.Payload, error)
}, nil }, nil
} }
func (s *TestServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) { func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
pl, err := serverNewPayload(in.GetResponseType(), in.GetResponseSize()) pl, err := serverNewPayload(in.GetResponseType(), in.GetResponseSize())
if err != nil { if err != nil {
return nil, err return nil, err
@ -504,7 +509,7 @@ func (s *TestServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*
}, nil }, nil
} }
func (s *TestServer) StreamingOutputCall(args *testpb.StreamingOutputCallRequest, stream testpb.TestService_StreamingOutputCallServer) error { func (s *testServer) StreamingOutputCall(args *testpb.StreamingOutputCallRequest, stream testpb.TestService_StreamingOutputCallServer) error {
cs := args.GetResponseParameters() cs := args.GetResponseParameters()
for _, c := range cs { for _, c := range cs {
if us := c.GetIntervalUs(); us > 0 { if us := c.GetIntervalUs(); us > 0 {
@ -523,7 +528,7 @@ func (s *TestServer) StreamingOutputCall(args *testpb.StreamingOutputCallRequest
return nil return nil
} }
func (s *TestServer) StreamingInputCall(stream testpb.TestService_StreamingInputCallServer) error { func (s *testServer) StreamingInputCall(stream testpb.TestService_StreamingInputCallServer) error {
var sum int var sum int
for { for {
in, err := stream.Recv() in, err := stream.Recv()
@ -540,7 +545,7 @@ func (s *TestServer) StreamingInputCall(stream testpb.TestService_StreamingInput
} }
} }
func (s *TestServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServer) error { func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServer) error {
for { for {
in, err := stream.Recv() in, err := stream.Recv()
if err == io.EOF { if err == io.EOF {
@ -568,7 +573,7 @@ func (s *TestServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServ
} }
} }
func (s *TestServer) HalfDuplexCall(stream testpb.TestService_HalfDuplexCallServer) error { func (s *testServer) HalfDuplexCall(stream testpb.TestService_HalfDuplexCallServer) error {
var msgBuf []*testpb.StreamingOutputCallRequest var msgBuf []*testpb.StreamingOutputCallRequest
for { for {
in, err := stream.Recv() in, err := stream.Recv()