Change name of comm msg size default consts

Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
hyperledger · Aug 23, 2021 · c91b546 · c91b546
1 parent da9e1bd
commit c91b546
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/internal/peer/node/start.go b/internal/peer/node/start.go
@@ -1129,7 +1129,7 @@ func secureDialOpts(credSupport *comm.CredentialSupport) func() []grpc.DialOptio
 		// set max send/recv msg sizes
 		dialOpts = append(
 			dialOpts,
-			grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(comm.MaxRecvMsgSize), grpc.MaxCallSendMsgSize(comm.MaxSendMsgSize)),
+			grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(comm.DefaultMaxRecvMsgSize), grpc.MaxCallSendMsgSize(comm.DefaultMaxSendMsgSize)),
 		)
 		// set the keepalive options
 		kaOpts := comm.DefaultKeepaliveOptions

diff --git a/internal/pkg/comm/client.go b/internal/pkg/comm/client.go
@@ -53,11 +53,11 @@ func NewGRPCClient(config ClientConfig) (*GRPCClient, error) {
 	}
 	client.timeout = config.Timeout
 	// set send/recv message size to package defaults
-	maxRecvMsgSize := MaxRecvMsgSize
+	maxRecvMsgSize := DefaultMaxRecvMsgSize
 	if config.MaxRecvMsgSize != 0 {
 		maxRecvMsgSize = config.MaxRecvMsgSize
 	}
-	maxSendMsgSize := MaxSendMsgSize
+	maxSendMsgSize := DefaultMaxSendMsgSize
 	if config.MaxSendMsgSize != 0 {
 		maxSendMsgSize = config.MaxSendMsgSize
 	}

diff --git a/internal/pkg/comm/config.go b/internal/pkg/comm/config.go
@@ -18,10 +18,14 @@ import (
 )
 
 // Configuration defaults
+
+// Max send and receive bytes for grpc clients and servers
+const (
+	DefaultMaxRecvMsgSize = 100 * 1024 * 1024
+	DefaultMaxSendMsgSize = 100 * 1024 * 1024
+)
+
 var (
-	// Max send and receive bytes for grpc clients and servers
-	MaxRecvMsgSize = 100 * 1024 * 1024
-	MaxSendMsgSize = 100 * 1024 * 1024
 	// Default peer keepalive options
 	DefaultKeepaliveOptions = KeepaliveOptions{
 		ClientInterval:    time.Duration(1) * time.Minute,  // 1 min

diff --git a/internal/pkg/comm/server.go b/internal/pkg/comm/server.go
@@ -125,8 +125,8 @@ func NewGRPCServerFromListener(listener net.Listener, serverConfig ServerConfig)
 		}
 	}
 	// set max send and recv msg sizes
-	serverOpts = append(serverOpts, grpc.MaxSendMsgSize(MaxSendMsgSize))
-	serverOpts = append(serverOpts, grpc.MaxRecvMsgSize(MaxRecvMsgSize))
+	serverOpts = append(serverOpts, grpc.MaxSendMsgSize(DefaultMaxSendMsgSize))
+	serverOpts = append(serverOpts, grpc.MaxRecvMsgSize(DefaultMaxRecvMsgSize))
 	// set the keepalive options
 	serverOpts = append(serverOpts, ServerKeepaliveOptions(serverConfig.KaOpts)...)
 	// set connection timeout