Merge "Fix incorrect usage of DeployChaincode in integration"

hyperledger · Nov 28, 2018 · b63ba8d · b63ba8d
2 parents ae094c9 + 9b429c9
commit b63ba8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/integration/e2e/e2e_test.go b/integration/e2e/e2e_test.go
@@ -318,7 +318,7 @@ var _ = Describe("EndToEnd", func() {
  nwo.DeployChaincode(network, "testchannel1", orderer, chaincode)
 
  network.CreateAndJoinChannel(orderer, "testchannel2")
- nwo.DeployChaincode(network, "testchannel2", orderer, chaincode)
+ nwo.InstantiateChaincode(network, "testchannel2", orderer, chaincode, peer)
 
  RunQueryInvokeQuery(network, orderer, peer, "testchannel1")
  RunQueryInvokeQuery(network, orderer, peer, "testchannel2")

diff --git a/integration/nwo/deploy.go b/integration/nwo/deploy.go
@@ -31,6 +31,10 @@ type Chaincode struct {
 // DeployChaincode is a helper that will install chaincode to all peers that
 // are connected to the specified channel, instantiate the chaincode on one of
 // the peers, and wait for the instantiation to complete on all of the peers.
+//
+// NOTE: This helper should not be used to deploy the same chaincode on
+// multiple channels as the install will fail on subsequent calls. Instead,
+// simply use InstantiateChaincode().
 func DeployChaincode(n *Network, channel string, orderer *Orderer, chaincode Chaincode, peers ...*Peer) {
  if len(peers) == 0 {
  peers = n.PeersWithChannel(channel)