From 01830654f7b42b8225559ac86041de90dbb7387b Mon Sep 17 00:00:00 2001
From: Cyrille Hemidy <cyrille.hemidy@gmail.com>
Date: Tue, 20 Feb 2018 23:16:37 +0100
Subject: [PATCH] fix golint

---
 testing/test_server.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/testing/test_server.go b/testing/test_server.go
index 2c6748f..0cbc6b8 100644
--- a/testing/test_server.go
+++ b/testing/test_server.go
@@ -102,14 +102,16 @@ func (TestServer) StreamingInputCall(str grpc_testing.TestService_StreamingInput
 		if str.Context().Err() != nil {
 			return str.Context().Err()
 		}
-		req, err := str.Recv()
-		if err != nil {
-			if err == io.EOF {
-				break
+		if req, err := str.Recv(); err != nil {
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+				return err
 			}
-			return err
+		} else {
+			sz += len(req.Payload.Body)
 		}
-		sz += len(req.Payload.Body)
 	}
 	if err := str.SendAndClose(&grpc_testing.StreamingInputCallResponse{AggregatedPayloadSize: int32(sz)}); err != nil {
 		return err
@@ -180,14 +182,14 @@ func (TestServer) HalfDuplexCall(str grpc_testing.TestService_HalfDuplexCallServ
 		if str.Context().Err() != nil {
 			return str.Context().Err()
 		}
-		req, err := str.Recv()
-		if err != nil {
+		if req, err := str.Recv(); err != nil {
 			if err == io.EOF {
 				break
 			}
 			return err
+		} else {
+			reqs = append(reqs, req)
 		}
-		reqs = append(reqs, req)
 	}
 	rsp := &grpc_testing.StreamingOutputCallResponse{}
 	for _, req := range reqs {