Skip to content

Commit bfc6caf

Browse files
committed
Upgrade grpc-go package
Move to v1.19.0 FAB-14686 #done Change-Id: I2c6faefe8e348cb299688680ac0bc264ba5dac0d Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
1 parent 09bfc70 commit bfc6caf

35 files changed

+700
-511
lines changed

Gopkg.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ noverify = [
119119

120120
[[constraint]]
121121
name = "google.golang.org/grpc"
122-
version = "=1.17.0"
122+
version = "=1.19.0"
123123

124124
[[constraint]]
125125
name = "gopkg.in/alecthomas/kingpin.v2"

cmd/common/comm/client_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ func TestTLSClient(t *testing.T) {
3131
assert.NoError(t, err)
3232
go srv.Start()
3333
defer srv.Stop()
34-
conf := Config{}
34+
conf := Config{
35+
PeerCACertPath: filepath.Join("testdata", "server", "ca.pem"),
36+
}
3537
cl, err := NewClient(conf)
3638
assert.NoError(t, err)
3739
_, port, _ := net.SplitHostPort(srv.Address())
38-
dial := cl.NewDialer(net.JoinHostPort("127.0.0.1", port))
40+
dial := cl.NewDialer(net.JoinHostPort("localhost", port))
3941
conn, err := dial()
4042
require.NoError(t, err)
4143
conn.Close()

internal/peer/common/ordererclient_test.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15+
"github.com/hyperledger/fabric/core/comm"
1516
"github.com/hyperledger/fabric/internal/peer/common"
1617
"github.com/spf13/viper"
1718
"github.com/stretchr/testify/assert"
@@ -83,9 +84,15 @@ func TestOrdererClient(t *testing.T) {
8384

8485
lis, err := net.Listen("tcp", "localhost:0")
8586
if err != nil {
86-
t.Fatalf("error creating server for test: %v", err)
87+
t.Fatalf("error creating listener for test: %v", err)
8788
}
8889
defer lis.Close()
90+
srv, err := comm.NewGRPCServerFromListener(lis, comm.ServerConfig{})
91+
if err != nil {
92+
t.Fatalf("error creating gRPC server for test: %v", err)
93+
}
94+
go srv.Start()
95+
defer srv.Stop()
8996
viper.Set("orderer.address", lis.Addr().String())
9097
oClient, err := common.NewOrdererClientFromEnv()
9198
if err != nil {

internal/peer/common/peerclient_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"testing"
1414
"time"
1515

16+
"github.com/hyperledger/fabric/core/comm"
1617
"github.com/hyperledger/fabric/internal/peer/common"
1718
"github.com/spf13/viper"
1819
"github.com/stretchr/testify/assert"
@@ -87,6 +88,12 @@ func TestPeerClient(t *testing.T) {
8788
t.Fatalf("error creating server for test: %v", err)
8889
}
8990
defer lis.Close()
91+
srv, err := comm.NewGRPCServerFromListener(lis, comm.ServerConfig{})
92+
if err != nil {
93+
t.Fatalf("error creating gRPC server for test: %v", err)
94+
}
95+
go srv.Start()
96+
defer srv.Stop()
9097
viper.Set("peer.address", lis.Addr().String())
9198
pClient1, err := common.NewPeerClientFromEnv()
9299
if err != nil {

vendor/google.golang.org/grpc/backoff.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/grpc/balancer/balancer.go

Lines changed: 19 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/grpc/balancer/base/balancer.go

Lines changed: 3 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/google.golang.org/grpc/balancer_conn_wrappers.go

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)