[FAB-10336] assertions & validation in instantiate

This baby step should keep the callers from polling.

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

Author: sykesm

integration/runner/peer.go

@@ -176,17 +176,24 @@ func (p *Peer) InstallChaincode(name, version, path string) {
 	Expect(sess).To(gbytes.Say(fmt.Sprintf("Name: %s, Version: %s,", name, version)))
 }
 
-func (p *Peer) InstantiateChaincode(name string, version string, orderer string, channel string, args string, policy string) *ginkgomon.Runner {
+func (p *Peer) InstantiateChaincode(name, version, orderer, channel, args, policy string) {
 	cmd := exec.Command(p.Path, "chaincode", "instantiate", "-n", name, "-v", version, "-o", orderer, "-C", channel, "-c", args, "-P", policy)
 	p.setupEnvironment(cmd)
 
-	r := ginkgomon.New(ginkgomon.Config{
-		Name:          "instantiate",
-		AnsiColorCode: "4;35m",
-		Command:       cmd,
-	})
+	sess, err := helpers.StartSession(cmd, "instantiate", "4;35m")
+	ExpectWithOffset(1, err).NotTo(HaveOccurred())
+	EventuallyWithOffset(1, sess, time.Minute).Should(gexec.Exit(0))
 
-	return r
+	listInstantiated := func() *gbytes.Buffer {
+		cmd := exec.Command(p.Path, "chaincode", "list", "--instantiated", "-C", channel)
+		p.setupEnvironment(cmd)
+
+		sess, err := helpers.StartSession(cmd, "list instantiated", "4;34m")
+		ExpectWithOffset(1, err).NotTo(HaveOccurred())
+		EventuallyWithOffset(1, sess, 10*time.Second).Should(gexec.Exit(0))
+		return sess.Buffer()
+	}
+	EventuallyWithOffset(1, listInstantiated, time.Minute).Should(gbytes.Say(fmt.Sprintf("Name: %s, Version: %s,", name, version)))
 }
 
 func (p *Peer) QueryChaincode(name string, channel string, args string) *ginkgomon.Runner {

integration/runner/peer_test.go

@@ -194,29 +194,13 @@ var _ = Describe("Peer", func() {
 		Eventually(liProcess.Wait(), 10*time.Second).Should(Receive(BeNil()))
 		Expect(liRunner).To(gbytes.Say("Name: mytest, Version: 1.0,"))
 
-		By("instantiate channel")
+		By("instantiate chaincode")
 		instantiateCC := components.Peer()
 		instantiateCC.ConfigDir = tempDir
 		instantiateCC.MSPConfigPath = filepath.Join(cryptoDir, "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		instRunner := instantiateCC.InstantiateChaincode("mytest", "1.0", "127.0.0.1:8050", "mychan", `{"Args":["init","a","100","b","200"]}`, "")
-		instProcess := ifrit.Invoke(instRunner)
-		Eventually(instProcess.Ready(), 10*time.Second).Should(BeClosed())
-		Eventually(instProcess.Wait(), 10*time.Second).ShouldNot(Receive(BeNil()))
+		instantiateCC.InstantiateChaincode("mytest", "1.0", "127.0.0.1:8050", "mychan", `{"Args":["init","a","100","b","200"]}`, "")
 
 		By("list instantiated chaincode")
-		listInstantiated := func() *gbytes.Buffer {
-			listInstan := components.Peer()
-			listInstan.ConfigDir = tempDir
-			listInstan.MSPConfigPath = filepath.Join(cryptoDir, "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-			linstRunner := listInstan.ChaincodeListInstantiated("mychan")
-			err := execute(linstRunner)
-			if err != nil {
-				return nil
-			}
-			return linstRunner.Buffer()
-		}
-		Eventually(listInstantiated, 90*time.Second, 500*time.Millisecond).Should(gbytes.Say("Name: mytest, Version: 1.0,"))
-
 		listInstan := components.Peer()
 		listInstan.ConfigDir = tempDir
 		listInstan.MSPConfigPath = filepath.Join(cryptoDir, "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")

integration/world/config.go

@@ -424,18 +424,7 @@ func (w *World) SetupChannel(d Deployment, peers []string) error {
 	p = w.Components.Peer()
 	p.ConfigDir = filepath.Join(w.Rootpath, "peer0.org1.example.com")
 	p.MSPConfigPath = filepath.Join(w.Rootpath, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-	adminRunner = p.InstantiateChaincode(d.Chaincode.Name, d.Chaincode.Version, d.Orderer, d.Channel, d.InitArgs, d.Policy)
-	execute(adminRunner)
-
-	listInstantiated := func() bool {
-		p = w.Components.Peer()
-		p.ConfigDir = filepath.Join(w.Rootpath, "peer0.org1.example.com")
-		p.MSPConfigPath = filepath.Join(w.Rootpath, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner = p.ChaincodeListInstantiated(d.Channel)
-		execute(adminRunner)
-		return strings.Contains(string(adminRunner.Buffer().Contents()), fmt.Sprintf("Path: %s", d.Chaincode.Path))
-	}
-	Eventually(listInstantiated, 90*time.Second, 500*time.Millisecond).Should(BeTrue())
+	p.InstantiateChaincode(d.Chaincode.Name, d.Chaincode.Version, d.Orderer, d.Channel, d.InitArgs, d.Policy)
 
 	return nil
 }