Remove explicit exclusion of chaincode, protos

FAB-15732

Change-Id: I0fcc10151c61c909aa5ce415f20b3bc8b143e1e8
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

core/chaincode/platforms/golang/platform.go

@@ -254,26 +254,12 @@ func (p *Platform) GetDeploymentPayload(path string) ([]byte, error) {
 		return nil, fmt.Errorf("Error obtaining imports: %s", err)
 	}
 
-	// --------------------------------------------------------------------------------------
-	// Remove any imports that are provided by the ccenv or system
-	// --------------------------------------------------------------------------------------
-	var provided = map[string]bool{
-		"github.com/hyperledger/fabric/core/chaincode/shim": true,
-		"github.com/hyperledger/fabric/protos/peer":         true,
-	}
-
 	// Golang "pseudo-packages" - packages which don't actually exist
 	var pseudo = map[string]bool{
 		"C": true,
 	}
 
 	imports = filter(imports, func(pkg string) bool {
-		// Drop if provided by CCENV
-		if _, ok := provided[pkg]; ok == true {
-			logger.Debugf("Discarding provided package %s", pkg)
-			return false
-		}
-
 		// Drop pseudo-packages
 		if _, ok := pseudo[pkg]; ok == true {
 			logger.Debugf("Discarding pseudo-package %s", pkg)

core/chaincode/platforms/golang/platform_test.go

@@ -236,7 +236,9 @@ func updateGopath(t *testing.T, path string) func() {
 }
 
 func TestGetDeploymentPayload(t *testing.T) {
-	testdataPath, err := filepath.Abs("testdata")
+	const testdata = "github.com/hyperledger/fabric/core/chaincode/platforms/golang/testdata/src/"
+
+	gopath, err := getGopath()
 	require.NoError(t, err)
 
 	platform := &Platform{}
@@ -246,13 +248,13 @@ func TestGetDeploymentPayload(t *testing.T) {
 		path   string
 		succ   bool
 	}{
-		{gopath: testdataPath, path: "chaincodes/noop", succ: true},
-		{gopath: testdataPath, path: "bad/chaincodes/noop", succ: false},
-		{gopath: testdataPath, path: "chaincodes/BadImport", succ: false},
-		{gopath: testdataPath, path: "chaincodes/BadMetadataInvalidIndex", succ: false},
-		{gopath: testdataPath, path: "chaincodes/BadMetadataUnexpectedFolderContent", succ: false},
-		{gopath: testdataPath, path: "chaincodes/BadMetadataIgnoreHiddenFile", succ: true},
-		{gopath: testdataPath, path: "chaincodes/empty/", succ: false},
+		{gopath: gopath, path: testdata + "chaincodes/noop", succ: true},
+		{gopath: gopath, path: testdata + "bad/chaincodes/noop", succ: false},
+		{gopath: gopath, path: testdata + "chaincodes/BadImport", succ: false},
+		{gopath: gopath, path: testdata + "chaincodes/BadMetadataInvalidIndex", succ: false},
+		{gopath: gopath, path: testdata + "chaincodes/BadMetadataUnexpectedFolderContent", succ: false},
+		{gopath: gopath, path: testdata + "chaincodes/BadMetadataIgnoreHiddenFile", succ: true},
+		{gopath: gopath, path: testdata + "chaincodes/empty/", succ: false},
 	}
 
 	for _, tst := range tests {