[FAB-8061] Update grpc-go to latest version

Update to grpc-go 1.10.0

We were several releases behind and there were
changes in behavior and some APIs which required
tweaking production and test code

Change-Id: I86bc6cd170b5a07777c11db485bb86fdc73e495a
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

Author: mastersingh24

Gopkg.lock

@@ -140,7 +140,7 @@ required = [
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "=1.5.2"
+  version = "=1.10.0"
 
 [[constraint]]
   name = "gopkg.in/alecthomas/kingpin.v2"

Gopkg.toml

@@ -172,7 +172,7 @@ func TestAccessControl(t *testing.T) {
 	// Create an attacker without a TLS certificate
 	_, err = newClient(t, 7052, nil, ca.CertBytes())
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "tls: bad certificate")
+	assert.Contains(t, err.Error(), "context deadline exceeded")
 
 	// Create an attacker with its own TLS certificate
 	maliciousCA, _ := NewCA()
@@ -181,7 +181,7 @@ func TestAccessControl(t *testing.T) {
 	assert.NoError(t, err)
 	_, err = newClient(t, 7052, &cert, ca.CertBytes())
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "tls: bad certificate")
+	assert.Contains(t, err.Error(), "context deadline exceeded")
 
 	// Create a chaincode for example01 that tries to impersonate example02
 	kp, err := auth.Generate("example01")

core/chaincode/accesscontrol/access_test.go

@@ -89,5 +89,5 @@ func TestTLSCA(t *testing.T) {
 	assert.NoError(t, err)
 	err = probeTLS(kp)
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "tls: bad certificate")
+	assert.Contains(t, err.Error(), "context deadline exceeded")
 }

core/chaincode/accesscontrol/ca_test.go

@@ -220,7 +220,7 @@ func TestNewConnection(t *testing.T) {
 			serverTLS: &tls.Config{
 				Certificates: []tls.Certificate{testServerCert}},
 			success:  false,
-			errorMsg: "certificate signed by unknown authority",
+			errorMsg: "context deadline exceeded",
 		},
 		{
 			name:       "client TLS / server TLS missing client cert",
@@ -237,7 +237,7 @@ func TestNewConnection(t *testing.T) {
 				Certificates: []tls.Certificate{testServerCert},
 				ClientAuth:   tls.RequireAndVerifyClientCert},
 			success:  false,
-			errorMsg: "bad certificate",
+			errorMsg: "context deadline exceeded",
 		},
 		{
 			name:       "client TLS / server TLS client cert",

core/comm/client_test.go

@@ -40,10 +40,15 @@ var (
 		tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
 		tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
 	}
+	// default connection timeout
+	DefaultConnectionTimeout = 5 * time.Second
 )
 
 // ServerConfig defines the parameters for configuring a GRPCServer instance
 type ServerConfig struct {
+	// ConnectionTimeout specifies the timeout for connection establishment
+	// for all new connections
+	ConnectionTimeout time.Duration
 	// SecOpts defines the security parameters
 	SecOpts *SecureOptions
 	// KaOpts defines the keepalive parameters

core/comm/config.go

@@ -14,6 +14,7 @@ import (
 )
 
 func TestConfig(t *testing.T) {
+	t.Parallel()
 	// check the defaults
 	assert.EqualValues(t, maxRecvMsgSize, MaxRecvMsgSize())
 	assert.EqualValues(t, maxSendMsgSize, MaxSendMsgSize())

core/comm/config_test.go

@@ -282,6 +282,7 @@ func newServer(org string, port int) *srv {
 		panic(fmt.Errorf("Failed listening on port %d: %v", port, err))
 	}
 	gSrv, err := NewGRPCServerFromListener(l, ServerConfig{
+		ConnectionTimeout: 250 * time.Millisecond,
 		SecOpts: &SecureOptions{
 			Certificate: certs["server.crt"],
 			Key:         certs["server.key"],
@@ -338,14 +339,14 @@ func testInvoke(t *testing.T, channelID string, s *srv, shouldSucceed bool) {
 	assert.NoError(t, err)
 	endpoint := fmt.Sprintf("localhost:%d", s.port)
 	ctx := context.Background()
-	ctx, _ = context.WithTimeout(ctx, time.Second*3)
+	ctx, _ = context.WithTimeout(ctx, 1*time.Second)
 	conn, err := grpc.DialContext(ctx, endpoint, grpc.WithTransportCredentials(creds), grpc.WithBlock())
 	if shouldSucceed {
 		assert.NoError(t, err)
 		defer conn.Close()
 	} else {
 		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "certificate signed by unknown authority")
+		assert.Contains(t, err.Error(), "context deadline exceeded")
 		return
 	}
 	client := testpb.NewTestServiceClient(conn)

core/comm/connection_test.go

@@ -17,6 +17,7 @@ import (
 )
 
 func TestCreds(t *testing.T) {
+	t.Parallel()
 	var creds credentials.TransportCredentials
 	creds = comm.NewServerTransportCredentials(&tls.Config{})
 	_, _, err := creds.ClientHandshake(nil, "", nil)

core/comm/creds_test.go

@@ -16,13 +16,15 @@ import (
 )
 
 func TestEmptyEndpoints(t *testing.T) {
+	t.Parallel()
 	noopFactory := func(endpoint string) (*grpc.ClientConn, error) {
 		return nil, nil
 	}
 	assert.Nil(t, NewConnectionProducer(noopFactory, []string{}))
 }
 
 func TestConnFailures(t *testing.T) {
+	t.Parallel()
 	conn2Endpoint := make(map[string]string)
 	shouldConnFail := map[string]bool{
 		"a": true,
@@ -70,6 +72,7 @@ func TestConnFailures(t *testing.T) {
 }
 
 func TestUpdateEndpoints(t *testing.T) {
+	t.Parallel()
 	conn2Endpoint := make(map[string]string)
 	connFactory := func(endpoint string) (*grpc.ClientConn, error) {
 		conn := &grpc.ClientConn{}
@@ -97,6 +100,7 @@ func TestUpdateEndpoints(t *testing.T) {
 }
 
 func TestDisableEndpoint(t *testing.T) {
+	t.Parallel()
 	orgEndpointDisableInterval := EndpointDisableInterval
 	EndpointDisableInterval = time.Millisecond * 100
 	defer func() { EndpointDisableInterval = orgEndpointDisableInterval }()