[FAB-8466] Use stdlib Context

This change uses the standard library Context. Leaking contexts are fixed. Third party pin scripts are fixed for the new paths. Change-Id: Ie0a2d93d4ca4a438cf18b9491f2c6d6b54deeb51 Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Feb 23, 2018 · 1a42cd9 · 1a42cd9
1 parent 86c95fa
commit 1a42cd9
Show file tree

Hide file tree

Showing 22 changed files with 181 additions and 191 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -20,10 +20,6 @@
   name = "github.com/golang/protobuf"
   version = "1.0.0"
 
-[[constraint]]
-  name = "golang.org/x/net"
-  branch = "master"
-
 [[constraint]]
   name = "github.com/cloudflare/cfssl"
   branch = "master"

diff --git a/internal/github.com/hyperledger/fabric-ca/util/util.go b/internal/github.com/hyperledger/fabric-ca/util/util.go
@@ -31,7 +31,6 @@ import (
 	"io/ioutil"
 	"math/big"
 	mrand "math/rand"
-
 	"net/http"
 	"path/filepath"
 	"reflect"
@@ -142,7 +141,7 @@ func CreateToken(csp core.CryptoSuite, cert []byte, key core.Key, body []byte) (
 //GenRSAToken signs the http body and cert with RSA using RSA private key
 // @csp : BCCSP instance
 /*
-func GenRSAToken(csp apicryptosuite.CryptoSuite, cert []byte, key []byte, body []byte) (string, error) {
+func GenRSAToken(csp core.CryptoSuite, cert []byte, key []byte, body []byte) (string, error) {
 	privKey, err := GetRSAPrivateKey(key)
 	if err != nil {
 		return "", err

diff --git a/internal/github.com/hyperledger/fabric/msp/identities.go b/internal/github.com/hyperledger/fabric/msp/identities.go
@@ -25,15 +25,15 @@ import (
 	"crypto/rand"
 	"crypto/x509"
 	"encoding/hex"
-
 	"encoding/pem"
 	"time"
 
+	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
+
 	"github.com/golang/protobuf/proto"
 	bccsp "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/cryptosuitebridge"
 	flogging "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/logbridge"
 	logging "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/logbridge"
-	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/msp"
 	"github.com/pkg/errors"
 )

diff --git a/internal/github.com/hyperledger/fabric/protos/orderer/ab.pb.go b/internal/github.com/hyperledger/fabric/protos/orderer/ab.pb.go
diff --git a/pkg/context/api/fab/orderer.go b/pkg/context/api/fab/orderer.go
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
 package fab
 
 import (
+	"context"
+
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 )
 
@@ -15,7 +17,7 @@ import (
 type Orderer interface {
 	URL() string
 	SendBroadcast(envelope *SignedEnvelope) (*common.Status, error)
-	SendDeliver(envelope *SignedEnvelope) (chan *common.Block, chan error)
+	SendDeliver(envelope *SignedEnvelope) (chan *common.Block, chan error, context.CancelFunc)
 }
 
 // A SignedEnvelope can can be sent to an orderer for broadcasting

diff --git a/pkg/fab/events/consumer/consumer.go b/pkg/fab/events/consumer/consumer.go
@@ -7,32 +7,29 @@ SPDX-License-Identifier: Apache-2.0
 package consumer
 
 import (
+	grpcContext "context"
+	"crypto/x509"
 	"io"
 	"sync"
 	"time"
 
-	grpcContext "golang.org/x/net/context"
-
 	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/ptypes"
+	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"
 
-	"github.com/golang/protobuf/ptypes"
+	consumer "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/events/consumer"
+	"github.com/hyperledger/fabric-sdk-go/pkg/context"
 	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
 	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/comm"
 	ccomm "github.com/hyperledger/fabric-sdk-go/pkg/core/config/comm"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
+	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 	ehpb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
-
-	"crypto/x509"
-
-	consumer "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/events/consumer"
-	"github.com/hyperledger/fabric-sdk-go/pkg/context"
-	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
-	"github.com/pkg/errors"
 )
 
 var logger = logging.NewLogger("fabric_sdk_go")
@@ -111,7 +108,9 @@ func newEventsClientConnectionWithAddress(peerAddress string, cert *x509.Certifi
 	opts = append(opts, grpc.WithDefaultCallOptions(grpc.FailFast(failFast)))
 
 	ctx := grpcContext.Background()
-	ctx, _ = grpcContext.WithTimeout(ctx, config.TimeoutOrDefault(core.EventHubConnection))
+	ctx, cancel := grpcContext.WithTimeout(ctx, config.TimeoutOrDefault(core.EventHubConnection))
+	defer cancel()
+
 	conn, err := grpc.DialContext(ctx, urlutil.ToAddress(peerAddress), opts...)
 	if err != nil {
 		return nil, err

diff --git a/pkg/fab/mocks/mockendorserserver.go b/pkg/fab/mocks/mockendorserserver.go
@@ -7,17 +7,16 @@ SPDX-License-Identifier: Apache-2.0
 package mocks
 
 import (
+	"context"
+	"fmt"
+	"net"
+
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
+	"google.golang.org/grpc"
 
 	rwsetutil "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
 	kvrwset "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"
-
-	"fmt"
-	"net"
-
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
-	"google.golang.org/grpc"
 )
 
 // MockEndorserServer mock endoreser server to process endorsement proposals

diff --git a/pkg/fab/mocks/mockorderer.go b/pkg/fab/mocks/mockorderer.go
@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package mocks
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
@@ -94,9 +95,8 @@ func (o *mockOrderer) SendBroadcast(envelope *fab.SignedEnvelope) (*common.Statu
 }
 
 // SendDeliver returns the channels for delivery of prepared mock values and errors (if any)
-func (o *mockOrderer) SendDeliver(envelope *fab.SignedEnvelope) (chan *common.Block,
-	chan error) {
-	return o.Deliveries, o.DeliveryErrors
+func (o *mockOrderer) SendDeliver(envelope *fab.SignedEnvelope) (chan *common.Block, chan error, context.CancelFunc) {
+	return o.Deliveries, o.DeliveryErrors, func() {}
 }
 
 func (o *mockOrderer) EnqueueSendBroadcastError(err error) {

diff --git a/pkg/fab/orderer/deprecated_test.go b/pkg/fab/orderer/deprecated_test.go
@@ -26,14 +26,15 @@ import (
 
 var kap keepalive.ClientParameters
 
-func TestDeprecatedSendDeliver(t *testing.T) {
+func TestDeprecatedSendDeliverHappy(t *testing.T) {
 	grpcServer := grpc.NewServer()
 	defer grpcServer.Stop()
-	mockServer, addr := startMockServer(t, grpcServer)
+	_, addr := startMockServer(t, grpcServer)
 
 	orderer, _ := NewOrderer("grpc://"+addr, "", "", mocks.NewMockConfig(), kap)
-	// Test deliver happy path
-	blocks, errs := orderer.SendDeliver(&fab.SignedEnvelope{})
+	blocks, errs, cancel := orderer.SendDeliver(&fab.SignedEnvelope{})
+	defer cancel()
+
 	select {
 	case block := <-blocks:
 		if string(block.Data.Data[0]) != "test" {
@@ -44,24 +45,21 @@ func TestDeprecatedSendDeliver(t *testing.T) {
 	case <-time.After(time.Second * 5):
 		t.Fatalf("Did not receive block or error from SendDeliver")
 	}
+}
 
-	// Test deliver without valid envelope
-	blocks, errs = orderer.SendDeliver(nil)
-	select {
-	case block := <-blocks:
-		t.Fatalf("Expected error got block: %#v", block)
-	case err := <-errs:
-		if err == nil {
-			t.Fatalf("Expected error with nil envelope")
-		}
-	case <-time.After(time.Second * 5):
-		t.Fatalf("Did not receive block or error from SendDeliver")
-	}
+func TestDeprecatedSendDeliverError(t *testing.T) {
+	grpcServer := grpc.NewServer()
+	defer grpcServer.Stop()
+	mockServer, addr := startMockServer(t, grpcServer)
+
+	orderer, _ := NewOrderer("grpc://"+addr, "", "", mocks.NewMockConfig(), kap)
 
 	// Test deliver with deliver error from OS
 	testError := errors.New("test error")
 	mockServer.DeliverError = testError
-	blocks, errs = orderer.SendDeliver(&fab.SignedEnvelope{})
+	blocks, errs, cancel := orderer.SendDeliver(&fab.SignedEnvelope{})
+	defer cancel()
+
 	select {
 	case block := <-blocks:
 		t.Fatalf("Expected error got block: %#v", block)
@@ -72,10 +70,14 @@ func TestDeprecatedSendDeliver(t *testing.T) {
 	case <-time.After(time.Second * 5):
 		t.Fatalf("Did not receive block or error from SendDeliver")
 	}
+}
 
-	orderer, _ = NewOrderer(testOrdererURL+"invalid-test", "", "", mocks.NewMockConfig(), kap)
+func TestDeprecatedSendDeliverBadURL(t *testing.T) {
+	orderer, _ := NewOrderer(testOrdererURL+"invalid-test", "", "", mocks.NewMockConfig(), kap)
 	// Test deliver happy path
-	blocks, errs = orderer.SendDeliver(&fab.SignedEnvelope{})
+	blocks, errs, cancel := orderer.SendDeliver(&fab.SignedEnvelope{})
+	defer cancel()
+
 	select {
 	case block := <-blocks:
 		t.Fatalf("This usecase was not supposed to receive blocks : %#v", block)
@@ -84,7 +86,6 @@ func TestDeprecatedSendDeliver(t *testing.T) {
 	case <-time.After(time.Second * 5):
 		t.Fatalf("Did not receive error from SendDeliver")
 	}
-
 }
 
 func TestDeprecatedNewOrdererWithTLS(t *testing.T) {
@@ -150,7 +151,8 @@ func TestDeprecatedSendDeliverServerBadResponse(t *testing.T) {
 	addr := startCustomizedMockServer(t, testOrdererURL, grpcServer, &broadcastServer)
 	orderer, _ := NewOrderer("grpc://"+addr, "", "", mocks.NewMockConfig(), kap)
 
-	blocks, errors := orderer.SendDeliver(&fab.SignedEnvelope{})
+	blocks, errors, cancel := orderer.SendDeliver(&fab.SignedEnvelope{})
+	defer cancel()
 
 	select {
 	case block := <-blocks:
@@ -180,7 +182,8 @@ func TestDeprecatedSendDeliverServerSuccessResponse(t *testing.T) {
 
 	orderer, _ := NewOrderer("grpc://"+addr, "", "", mocks.NewMockConfig(), kap)
 
-	blocks, errors := orderer.SendDeliver(&fab.SignedEnvelope{})
+	blocks, errors, cancel := orderer.SendDeliver(&fab.SignedEnvelope{})
+	defer cancel()
 
 	select {
 	case block := <-blocks:
@@ -205,7 +208,8 @@ func TestDeprecatedSendDeliverFailure(t *testing.T) {
 	addr := startCustomizedMockServer(t, testOrdererURL, grpcServer, &broadcastServer)
 	orderer, _ := NewOrderer("grpc://"+addr, "", "", mocks.NewMockConfig(), kap)
 
-	blocks, errors := orderer.SendDeliver(&fab.SignedEnvelope{})
+	blocks, errors, cancel := orderer.SendDeliver(&fab.SignedEnvelope{})
+	defer cancel()
 
 	select {
 	case block := <-blocks:
@@ -259,13 +263,3 @@ func TestDeprecatedSendBroadcastError(t *testing.T) {
 	}
 
 }
-
-func TestDeprecatedInterfaces(t *testing.T) {
-	var apiOrderer fab.Orderer
-	var orderer Orderer
-
-	apiOrderer = &orderer
-	if apiOrderer == nil {
-		t.Fatalf("this shouldn't happen.")
-	}
-}