[FAB-10255] Consolidate the chaincode for tests

Instead of each test setup having it's own copy
of chaincode we should have a single chaincodei directory containing
chaincode that can be accessed.

Change-Id: I93916f9875f9d8d302d7a42f2488536050614bfb
Signed-off-by: Latitia M. Haskins <latitia.haskins@gmail.com>

Author: lhaskins

integration/e2e/testdata/chaincode/src/simple/chaincode.go integration/chaincode/simple/chaincode.go

@@ -10,9 +10,8 @@ import (
 	"fmt"
 	"os"
 
-	"simple"
-
 	"github.com/hyperledger/fabric/core/chaincode/shim"
+	"github.com/hyperledger/fabric/integration/chaincode/simple"
 )
 
 func main() {

integration/e2e/testdata/chaincode/src/simple/cmd/main.go integration/chaincode/simple/cmd/main.go

@@ -11,7 +11,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"strings"
 	"syscall"
 	"time"
 
@@ -93,8 +92,7 @@ var _ = Describe("EndToEnd", func() {
 			Chaincode: world.Chaincode{
 				Name:     "mycc",
 				Version:  "1.0",
-				Path:     filepath.Join("simple", "cmd"),
-				GoPath:   filepath.Join(testDir, "chaincode"),
+				Path:     "github.com/hyperledger/fabric/integration/chaincode/simple/cmd",
 				ExecPath: os.Getenv("PATH"),
 			},
 			InitArgs: `{"Args":["init","a","100","b","200"]}`,
@@ -237,38 +235,15 @@ var _ = Describe("EndToEnd", func() {
 		w.BuildNetwork()
 
 		By("setting up the channel")
-		copyDir(filepath.Join("testdata", "chaincode"), filepath.Join(testDir, "chaincode"))
 		err := w.SetupChannel()
 		Expect(err).NotTo(HaveOccurred())
 
-		By("verifying the chaincode is installed")
-		adminPeer := components.Peer()
-		adminPeer.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
-		adminPeer.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner := adminPeer.ChaincodeListInstalled()
-		execute(adminRunner)
-		Eventually(adminRunner.Buffer()).Should(gbytes.Say("Path: simple/cmd"))
-
-		By("waiting for the chaincode to complete instantiation")
-		listInstantiated := func() bool {
-			p := components.Peer()
-			p.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
-			p.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-			adminRunner := p.ChaincodeListInstantiated(w.Deployment.Channel)
-			err := execute(adminRunner)
-			if err != nil {
-				return false
-			}
-			return strings.Contains(string(adminRunner.Buffer().Contents()), "Path: simple/cmd")
-		}
-		Eventually(listInstantiated, 30*time.Second, 500*time.Millisecond).Should(BeTrue())
-
 		By("querying the chaincode")
-		adminPeer = components.Peer()
+		adminPeer := components.Peer()
 		adminPeer.LogLevel = "debug"
 		adminPeer.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
 		adminPeer.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner = adminPeer.QueryChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["query","a"]}`)
+		adminRunner := adminPeer.QueryChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["query","a"]}`)
 		execute(adminRunner)
 		Eventually(adminRunner.Buffer()).Should(gbytes.Say("100"))
 

integration/e2e/e2e_test.go

@@ -12,7 +12,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strings"
 	"syscall"
 	"time"
 
@@ -93,8 +92,7 @@ var _ = Describe("EndToEnd", func() {
 			Chaincode: world.Chaincode{
 				Name:     "mycc",
 				Version:  "1.0",
-				Path:     filepath.Join("simple", "cmd"),
-				GoPath:   filepath.Join(testDir, "chaincode"),
+				Path:     "github.com/hyperledger/fabric/integration/chaincode/simple/cmd",
 				ExecPath: os.Getenv("PATH"),
 			},
 			InitArgs: `{"Args":["init","a","100","b","200"]}`,
@@ -237,7 +235,6 @@ var _ = Describe("EndToEnd", func() {
 		w.BuildNetwork()
 
 		By("setting up the channel")
-		copyDir(filepath.Join("testdata", "chaincode"), filepath.Join(testDir, "chaincode"))
 		err := w.SetupChannel()
 		Expect(err).NotTo(HaveOccurred())
 
@@ -252,34 +249,12 @@ var _ = Describe("EndToEnd", func() {
 		activations = CountValidationPluginActivations()
 		Expect(activations).To(Equal(peerCount))
 
-		By("verifying the chaincode is installed")
-		adminPeer := components.Peer()
-		adminPeer.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
-		adminPeer.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner := adminPeer.ChaincodeListInstalled()
-		execute(adminRunner)
-		Eventually(adminRunner.Buffer()).Should(gbytes.Say("Path: simple/cmd"))
-
-		By("waiting for the chaincode to complete instantiation")
-		listInstantiated := func() bool {
-			p := components.Peer()
-			p.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
-			p.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-			adminRunner := p.ChaincodeListInstantiated(w.Deployment.Channel)
-			err := execute(adminRunner)
-			if err != nil {
-				return false
-			}
-			return strings.Contains(string(adminRunner.Buffer().Contents()), "Path: simple/cmd")
-		}
-		Eventually(listInstantiated, 30*time.Second, 500*time.Millisecond).Should(BeTrue())
-
 		By("querying the chaincode")
-		adminPeer = components.Peer()
+		adminPeer := components.Peer()
 		adminPeer.LogLevel = "debug"
 		adminPeer.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
 		adminPeer.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner = adminPeer.QueryChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["query","a"]}`)
+		adminRunner := adminPeer.QueryChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["query","a"]}`)
 		execute(adminRunner)
 		Eventually(adminRunner.Buffer()).Should(gbytes.Say("100"))
 
@@ -310,21 +285,6 @@ func copyFile(src, dest string) {
 	Expect(err).NotTo(HaveOccurred())
 }
 
-func copyDir(src, dest string) {
-	os.MkdirAll(dest, 0755)
-	objects, err := ioutil.ReadDir(src)
-	for _, obj := range objects {
-		srcfileptr := src + "/" + obj.Name()
-		destfileptr := dest + "/" + obj.Name()
-		if obj.IsDir() {
-			copyDir(srcfileptr, destfileptr)
-		} else {
-			copyFile(srcfileptr, destfileptr)
-		}
-	}
-	Expect(err).NotTo(HaveOccurred())
-}
-
 func execute(r ifrit.Runner) (err error) {
 	p := ifrit.Invoke(r)
 	Eventually(p.Ready()).Should(BeClosed())