remove extra variable

Author: Pranjali-2501

stream.go

@@ -542,8 +542,6 @@ type clientStream struct {
 
 	sentLast bool // sent an end stream
 
-	recvFirstMsg bool // received first msg
-
 	methodConfig *MethodConfig
 
 	ctx context.Context // the application's context, wrapped by stats/tracing
@@ -1137,17 +1135,14 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
 				return statusErr
 			}
 			// received no msg and status ok for non-server streaming rpcs.
-			if !cs.desc.ServerStreams && !cs.recvFirstMsg {
+			if !cs.desc.ServerStreams {
 				return status.Errorf(codes.Internal, "cardinality violation: received no response message from non-streaming RPC")
 			}
 			return io.EOF // indicates successful end of stream.
 		}
 
 		return toRPCErr(err)
 	}
-	if !cs.desc.ServerStreams {
-		cs.recvFirstMsg = true
-	}
 	if a.trInfo != nil {
 		a.mu.Lock()
 		if a.trInfo.tr != nil {
@@ -1483,6 +1478,10 @@ func (as *addrConnStream) RecvMsg(m any) (err error) {
 			if statusErr := as.transportStream.Status().Err(); statusErr != nil {
 				return statusErr
 			}
+			// received no msg and status ok for non-server streaming rpcs.
+			if !as.desc.ServerStreams {
+				return status.Errorf(codes.Internal, "cardinality violation: received no response message from non-streaming RPC")
+			}
 			return io.EOF // indicates successful end of stream.
 		}
 		return toRPCErr(err)

test/end2end_test.go

@@ -3736,42 +3736,6 @@ func (s) TestClientStreaming_ReturnErrorAfterSendAndClose(t *testing.T) {
 	}
 }
 
-// Tests for a successful RPC, client will receive io.EOF for second call to RecvMsg().
-func (s) TestClientStreaming_ClientCallRecvMsgTwice(t *testing.T) {
-	ss := stubserver.StubServer{
-		StreamingInputCallF: func(stream testgrpc.TestService_StreamingInputCallServer) error {
-			if err := stream.SendAndClose(&testpb.StreamingInputCallResponse{}); err != nil {
-				t.Errorf("stream.SendAndClose(_) = %v, want <nil>", err)
-			}
-			return nil
-		},
-	}
-	if err := ss.Start(nil); err != nil {
-		t.Fatal("Error starting server:", err)
-	}
-	defer ss.Stop()
-
-	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
-	defer cancel()
-	stream, err := ss.Client.StreamingInputCall(ctx)
-	if err != nil {
-		t.Fatalf(".StreamingInputCall(_) = _, %v, want <nil>", err)
-	}
-	if err := stream.Send(&testpb.StreamingInputCallRequest{}); err != nil {
-		t.Fatalf("stream.Send(_) = %v, want <nil>", err)
-	}
-	if err := stream.CloseSend(); err != nil {
-		t.Fatalf("stream.CloseSend() = %v, want <nil>", err)
-	}
-	resp := new(testpb.StreamingInputCallResponse)
-	if err := stream.RecvMsg(resp); err != nil {
-		t.Fatalf("stream.RecvMsg() = %v , want <nil>", err)
-	}
-	if err := stream.RecvMsg(resp); err != io.EOF {
-		t.Fatalf("stream.RecvMsg() = %v, want error %s", err, io.EOF)
-	}
-}
-
 // Tests that a client receives a cardinality violation error for unary
 // RPCs if the server doesn't send a message before returning status OK.
 func (s) TestUnaryRPC_ServerSendsOnlyTrailersWithOK(t *testing.T) {
@@ -3816,42 +3780,6 @@ func (s) TestUnaryRPC_ServerSendsOnlyTrailersWithOK(t *testing.T) {
 	}
 }
 
-// Tests for a successful unary RPC, client will receive io.EOF for second call to RecvMsg().
-func (s) TestUnaryRPC_ClientCallRecvMsgTwice(t *testing.T) {
-	e := tcpTLSEnv
-	te := newTest(t, e)
-	defer te.tearDown()
-
-	te.startServer(&testServer{security: e.security})
-
-	cc := te.clientConn()
-	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
-	defer cancel()
-
-	desc := &grpc.StreamDesc{
-		StreamName:    "UnaryCall",
-		ServerStreams: false,
-		ClientStreams: false,
-	}
-	stream, err := cc.NewStream(ctx, desc, "/grpc.testing.TestService/UnaryCall")
-	if err != nil {
-		t.Fatalf("cc.NewStream() failed unexpectedly: %v", err)
-	}
-
-	if err := stream.SendMsg(&testpb.SimpleRequest{}); err != nil {
-		t.Fatalf("stream.SendMsg(_) = %v, want <nil>", err)
-	}
-
-	resp := &testpb.SimpleResponse{}
-	if err := stream.RecvMsg(resp); err != nil {
-		t.Fatalf("stream.RecvMsg() = %v , want <nil>", err)
-	}
-
-	if err = stream.RecvMsg(resp); err != io.EOF {
-		t.Fatalf("stream.RecvMsg() = %v, want error %s", err, io.EOF)
-	}
-}
-
 func (s) TestExceedMaxStreamsLimit(t *testing.T) {
 	for _, e := range listTestEnv() {
 		testExceedMaxStreamsLimit(t, e)