Parse the chaincode name from the label to compare

hyperledger · Aug 17, 2023 · 392e51f · 392e51f
1 parent 6af2686
commit 392e51f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/internal/blockchain/fabric/fabric_provider.go b/internal/blockchain/fabric/fabric_provider.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"regexp"
 
 	"github.com/hyperledger/firefly-cli/internal/blockchain/fabric/fabconnect"
 	"github.com/hyperledger/firefly-cli/internal/docker"
@@ -543,7 +544,9 @@ func (p *FabricProvider) DeployContract(filename, contractName, instanceName str
 	chaincodeInstalled := false
 	packageID := ""
 	for _, installedChaincode := range res.InstalledChaincodes {
-		if installedChaincode.Label == chaincode {
+		validLabel := regexp.MustCompile(`^([^_]+)_.+$`)
+		matches := validLabel.FindStringSubmatch(installedChaincode.Label)
+		if len(matches) > 0 && matches[1] == chaincode {
 			chaincodeInstalled = true
 			packageID = installedChaincode.PackageID
 			break