Address review comments

Signed-off-by: senthil <cendhu@gmail.com>

Author: cendhu

service/coordinator/signature_verifier_manager.go

@@ -234,14 +234,14 @@ func (sv *signatureVerifier) sendTransactionsToSVService(
 
 		if firstBatch {
 			if err := splitAndSendToVerifier(stream, request); err != nil {
-				return errors.Wrap(err, "send to stream ended with error")
+				return err
 			}
 			firstBatch = false
 			continue
 		}
 
 		if err := stream.Send(request); err != nil {
-			return errors.Wrap(err, "send to stream ended with error")
+			return errors.Wrap(err, streamEndErrWrap)
 		}
 		logger.Debugf("Batch contains %d TXs, and was stored in the accumulator and sent to a sv", batchSize)
 	}
@@ -281,7 +281,7 @@ func splitAndSendToVerifier(
 		if err := stream.Send(rBatch); err != nil {
 			// ResourceExhausted should not occur here, as we have split a block's transactions
 			// into two batches, assuming the block size is less than the maximum gRPC message size.
-			return err
+			return errors.Wrap(err, streamEndErrWrap)
 		}
 	}
 

service/coordinator/validator_committer_manager.go

@@ -25,6 +25,8 @@ import (
 	"github.com/hyperledger/fabric-x-committer/utils/monitoring/promutil"
 )
 
+const streamEndErrWrap = "sending to stream ended with an error"
+
 type (
 	// validatorCommitterManager is responsible for managing all communication with
 	// all vcservices. It is responsible for:
@@ -263,7 +265,7 @@ func (vc *validatorCommitter) sendTransactionsToVCService(
 
 		if firstBatch {
 			if err := splitAndSendToVC(stream, txBatch); err != nil {
-				return errors.Wrap(err, "send to stream ended with error")
+				return err
 			}
 			firstBatch = false
 			continue
@@ -272,7 +274,7 @@ func (vc *validatorCommitter) sendTransactionsToVCService(
 		if err := stream.Send(&protovcservice.TransactionBatch{
 			Transactions: txBatch,
 		}); err != nil {
-			return errors.Wrap(err, "send to stream ended with error")
+			return errors.Wrap(err, streamEndErrWrap)
 		}
 		logger.Debugf("TX node contains %d TXs, and was sent to a vcservice", len(txBatch))
 	}
@@ -297,7 +299,7 @@ func splitAndSendToVC(
 
 	for _, rBatch := range blkToBatch {
 		if err := stream.Send(rBatch); err != nil {
-			return err
+			return errors.Wrap(err, streamEndErrWrap)
 		}
 	}
 

utils/connection/client_util.go

@@ -35,7 +35,7 @@ const (
 	// defaultGrpcMaxAttempts is set to a high number to allow the timeout to dictate the retry end condition.
 	defaultGrpcMaxAttempts = 1024
 	// TODO: All services including the orderer must use the same default maximum message size.
-	//       Hence, we need to move this constant to fabrix-x-common.
+	//       Hence, we need to move this constant to fabric-x-common.
 	maxMsgSize       = 100 * 1024 * 1024
 	scResolverSchema = "sc.connection"
 )

utils/connection/server_util.go

@@ -42,7 +42,8 @@ func NewLocalHostServer() *ServerConfig {
 
 // GrpcServer instantiate a [grpc.Server].
 func (c *ServerConfig) GrpcServer() *grpc.Server {
-	var opts []grpc.ServerOption
+	opts := append([]grpc.ServerOption{}, grpc.MaxRecvMsgSize(maxMsgSize))
+	opts = append(opts, grpc.MaxSendMsgSize(maxMsgSize))
 	if c.Creds != nil {
 		cert, err := tls.LoadX509KeyPair(c.Creds.CertPath, c.Creds.KeyPath)
 		utils.Must(err)
@@ -67,8 +68,6 @@ func (c *ServerConfig) GrpcServer() *grpc.Server {
 			PermitWithoutStream: c.KeepAlive.EnforcementPolicy.PermitWithoutStream,
 		}))
 	}
-	opts = append(opts, grpc.MaxRecvMsgSize(maxMsgSize))
-	opts = append(opts, grpc.MaxSendMsgSize(maxMsgSize))
 	return grpc.NewServer(opts...)
 }