Skip to content

Commit

Permalink
FAB-5930 Upgrade to grpc-go v1.5.2
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mastersingh24 committed Sep 2, 2017
1 parent b4f302c commit c0e1c79
Show file tree
Hide file tree
Showing 27 changed files with 1,160 additions and 665 deletions.
5 changes: 3 additions & 2 deletions core/peer/peer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ func TestCreateChainFromBlock(t *testing.T) {
grpcServer := grpc.NewServer()
socket, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 13611))
assert.NoError(t, err)
go grpcServer.Serve(socket)
defer grpcServer.Stop()

msptesttools.LoadMSPSetupForTesting()

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

assert.NoError(t, err)

go grpcServer.Serve(socket)
defer grpcServer.Stop()

err = CreateChainFromBlock(block)
if err != nil {
t.Fatalf("failed to create chain %s", err)
Expand Down
6 changes: 3 additions & 3 deletions gossip/service/gossip_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ func TestInitGossipService(t *testing.T) {
socket, error := net.Listen("tcp", fmt.Sprintf("%s:%d", "", 5611))
assert.NoError(t, error)

go grpcServer.Serve(socket)
defer grpcServer.Stop()

msptesttools.LoadMSPSetupForTesting()
identity, _ := mgmt.GetLocalSigningIdentityOrPanic().Serialize()

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

go grpcServer.Serve(socket)
defer grpcServer.Stop()

defer GetGossipService().Stop()
gossip := GetGossipService()

Expand Down
1 change: 1 addition & 0 deletions vendor/google.golang.org/grpc/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 23 additions & 37 deletions vendor/google.golang.org/grpc/CONTRIBUTING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

230 changes: 202 additions & 28 deletions vendor/google.golang.org/grpc/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions vendor/google.golang.org/grpc/PATENTS

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/google.golang.org/grpc/backoff.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c0e1c79

Please sign in to comment.