Fix packageID for chaincode approval

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
hyperledger · Mar 17, 2022 · 1b173ac · 1b173ac
1 parent 75895b5
commit 1b173ac
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/internal/blockchain/fabric/fabric_provider.go b/internal/blockchain/fabric/fabric_provider.go
@@ -447,11 +447,22 @@ func (p *FabricProvider) DeployContract(filename, contractName string, member ty
 	if err != nil {
 		return "", err
 	}
-	if len(res.InstalledChaincodes) == 0 {
+
+	chaincodeInstalled := false
+	packageID := ""
+	for _, installedChaincode := range res.InstalledChaincodes {
+		if installedChaincode.Label == chaincode {
+			chaincodeInstalled = true
+			packageID = installedChaincode.PackageID
+			break
+		}
+	}
+
+	if !chaincodeInstalled {
 		return "", fmt.Errorf("failed to find installed chaincode")
 	}
 
-	if err := p.approveChaincode(channel, chaincode, version, res.InstalledChaincodes[0].PackageID); err != nil {
+	if err := p.approveChaincode(channel, chaincode, version, packageID); err != nil {
 		return "", err
 	}