[FAB-8752] Add golang.org context to third_party protos

Change-Id: I90c4c08b4be895a37c2ac912819010342968902c Signed-off-by: Firas Qutishat <[email protected]> Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Mar 9, 2018 · 79d6417 · 79d6417
1 parent 4664f80
commit 79d6417
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -20,6 +20,10 @@
   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/lib/clientconfig.go b/internal/github.com/hyperledger/fabric-ca/lib/clientconfig.go
@@ -33,7 +33,7 @@ type ClientConfig struct {
 	TLS        tls.ClientTLSConfig
 	Enrollment api.EnrollmentRequest
 	CSR        api.CSRInfo
-	ID         core.RegistrationRequest
+	ID         api.RegistrationRequest
 	Revoke     api.RevocationRequest
 	CAInfo     api.GetCAInfoRequest
 	CAName     string           `help:"Name of CA"`

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/fab/mocks/mockendorserserver.go b/pkg/fab/mocks/mockendorserserver.go
@@ -7,11 +7,11 @@ 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"

diff --git a/scripts/third_party_pins/fabric/apply_upstream.sh b/scripts/third_party_pins/fabric/apply_upstream.sh
@@ -92,7 +92,6 @@ declare -a PROTOS_IMPORT_SUBSTS=(
     's/\"github.com\/hyperledger\/fabric\/protos\/utils/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/utils/g'
     's/\"github.com\/hyperledger\/fabric\/protos\//\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\//g'
     's/\"github.com\/hyperledger\/fabric\//\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\//g'
-    's/\"golang.org\/x\/net\/context\"/\"context\"/g'
 )
 eval "INTERNAL_PATH=$THIRDPARTY_FABRIC_API_PATH TMP_PROJECT_PATH=$TMP_PROJECT_PATH IMPORT_SUBSTS=\"${PROTOS_IMPORT_SUBSTS[*]}\" $SCRIPTS_PATH/apply_fabric_protos.sh"
 
@@ -110,7 +109,6 @@ declare -a PROTOS_INTERNAL_IMPORT_SUBSTS=(
     's/\"github.com\/hyperledger\/fabric\/protos\/utils/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/utils/g'
     's/\"github.com\/hyperledger\/fabric\/protos/\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\/protos/g'
     's/\"github.com\/hyperledger\/fabric\//\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\//g'
-    's/\"golang.org\/x\/net\/context\"/\"context\"/g'
 )
 eval "INTERNAL_PATH=$THIRDPARTY_INTERNAL_FABRIC_PATH TMP_PROJECT_PATH=$TMP_PROJECT_PATH IMPORT_SUBSTS=\"${PROTOS_INTERNAL_IMPORT_SUBSTS[*]}\" $SCRIPTS_PATH/apply_fabric_protos_internal.sh"
 

diff --git a/third_party/github.com/hyperledger/fabric/protos/peer/events.pb.go b/third_party/github.com/hyperledger/fabric/protos/peer/events.pb.go
diff --git a/third_party/github.com/hyperledger/fabric/protos/peer/peer.pb.go b/third_party/github.com/hyperledger/fabric/protos/peer/peer.pb.go