[FABG-900] Remove third_party fabric module

This change removes the module definition third_party/.../fabric since protos have now been externalized. Change-Id: I621627332ed26d09f501045588060373ab8eb174 Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Aug 27, 2019 · 6c3f788 · 6c3f788
1 parent 7dc798e
commit 6c3f788
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 53 deletions.
diff --git a/scripts/third_party_pins/fabric/apply_upstream.sh b/scripts/third_party_pins/fabric/apply_upstream.sh
@@ -45,9 +45,6 @@ echo 'Removing current upstream project from working directory ...'
 rm -Rf "${THIRDPARTY_FABRIC_PATH}" "${THIRDPARTY_INTERNAL_FABRIC_PATH}"
 mkdir -p "${THIRDPARTY_FABRIC_PATH}" "${THIRDPARTY_INTERNAL_FABRIC_PATH}"
 
-# restore module definitions
-git checkout "${THIRDPARTY_FABRIC_PATH}/go.mod" "${THIRDPARTY_FABRIC_PATH}/go.sum"
-
 # Create internal utility structure
 mkdir -p ${TMP_PROJECT_PATH}/internal/protoutil
 cp -R ${TMP_PROJECT_PATH}/protoutil ${TMP_PROJECT_PATH}/internal/

diff --git a/test/integration/go.mod b/test/integration/go.mod
@@ -6,13 +6,10 @@ module github.com/hyperledger/fabric-sdk-go/test/integration
 
 replace github.com/hyperledger/fabric-sdk-go => ../../
 
-replace github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric => ../../third_party/github.com/hyperledger/fabric
-
 require (
 	github.com/golang/protobuf v1.3.2
 	github.com/hyperledger/fabric-protos-go v0.0.0-20190823190507-26c33c998676
 	github.com/hyperledger/fabric-sdk-go v0.0.0-00010101000000-000000000000
-	github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric v2.0.0-alpha+incompatible
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.3.0
 	google.golang.org/grpc v1.23.0

diff --git a/test/performance/go.mod b/test/performance/go.mod
@@ -6,13 +6,10 @@ module github.com/hyperledger/fabric-sdk-go/test/performance
 
 replace github.com/hyperledger/fabric-sdk-go => ../../
 
-replace github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric => ../../third_party/github.com/hyperledger/fabric
-
 require (
 	github.com/golang/protobuf v1.3.2
 	github.com/hyperledger/fabric-protos-go v0.0.0-20190823190507-26c33c998676
 	github.com/hyperledger/fabric-sdk-go v0.0.0-00010101000000-000000000000
-	github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric v2.0.0-alpha+incompatible
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/net v0.0.0-20190311183353-d8887717615a

diff --git a/third_party/github.com/hyperledger/fabric/go.mod b/third_party/github.com/hyperledger/fabric/go.mod
diff --git a/third_party/github.com/hyperledger/fabric/go.sum b/third_party/github.com/hyperledger/fabric/go.sum