Skip to content

Commit c0e1c79

Browse files
committed
FAB-5930 Upgrade to grpc-go v1.5.2
This updates grpc-go from version 1.4.0 to the latest version which is 1.5.2. There are a few things we can take advantage of in the future but it's always a good idea to say current. Most of the CR is just updating the vendoring of the grpc and grpclog packages. A couple of changes where required to some test files because v1.5.2 does not allow you to register a service on a running gRPC server. Change-Id: Ia1499897426db9383801a5e717746f5c58b362e0 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
1 parent b4f302c commit c0e1c79

27 files changed

+1160
-665
lines changed

core/peer/peer_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ func TestCreateChainFromBlock(t *testing.T) {
144144
grpcServer := grpc.NewServer()
145145
socket, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 13611))
146146
assert.NoError(t, err)
147-
go grpcServer.Serve(socket)
148-
defer grpcServer.Stop()
149147

150148
msptesttools.LoadMSPSetupForTesting()
151149

@@ -164,6 +162,9 @@ func TestCreateChainFromBlock(t *testing.T) {
164162

165163
assert.NoError(t, err)
166164

165+
go grpcServer.Serve(socket)
166+
defer grpcServer.Stop()
167+
167168
err = CreateChainFromBlock(block)
168169
if err != nil {
169170
t.Fatalf("failed to create chain %s", err)

gossip/service/gossip_service_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ func TestInitGossipService(t *testing.T) {
6060
socket, error := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 5611))
6161
assert.NoError(t, error)
6262

63-
go grpcServer.Serve(socket)
64-
defer grpcServer.Stop()
65-
6663
msptesttools.LoadMSPSetupForTesting()
6764
identity, _ := mgmt.GetLocalSigningIdentityOrPanic().Serialize()
6865

@@ -80,6 +77,9 @@ func TestInitGossipService(t *testing.T) {
8077
}
8178
wg.Wait()
8279

80+
go grpcServer.Serve(socket)
81+
defer grpcServer.Stop()
82+
8383
defer GetGossipService().Stop()
8484
gossip := GetGossipService()
8585

vendor/google.golang.org/grpc/AUTHORS

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

vendor/google.golang.org/grpc/CONTRIBUTING.md

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

vendor/google.golang.org/grpc/LICENSE

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

vendor/google.golang.org/grpc/PATENTS

Lines changed: 0 additions & 22 deletions
This file was deleted.

vendor/google.golang.org/grpc/README.md

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/backoff.go

Lines changed: 18 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)