Add check for unique chaincode names

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml.test.ts.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml 1`] = `[]`;

e2e/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml.test.ts

@@ -0,0 +1,7 @@
+import performTests from "./performTests";
+
+const config = "samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml";
+
+describe(config, () => {
+  performTests(config);
+});

e2e/fabloCommands.test.ts

@@ -139,6 +139,31 @@ describe("validate", () => {
     expect(commandResult.output).toContain(" instance.orgs[0].organization.mspName : does not match pattern");
     expect(commands.getFiles()).toEqual([]);
   });
+
+  it("should throw an error for duplicate chaincode names across different channels", () => {
+    // Given
+    commands.fabloExec("init");
+    const fabloConfig = `${commands.relativeRoot}/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml`;
+
+    // When
+    const commandResult = commands.fabloExec(`validate ${fabloConfig}`);
+
+    // Then
+    // expect(commandResult).toEqual(TestCommands.success());
+    expect(commandResult.output).toContain("Chaincode name 'duplicateChaincode' is not unique");
+  });
+
+  it("should validate when all chaincode names are unique across channels", () => {
+    // Given
+    const fabloConfig = `${commands.relativeRoot}/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml`;
+
+    // When
+    const commandResult = commands.fabloExec(`validate ${fabloConfig}`);
+
+    // Then
+    expect(commandResult.output).toContain("Validation errors count: 0");
+    expect(commandResult.output).not.toContain("is not unique");
+  });
 });
 
 describe("extend config", () => {

samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml

@@ -0,0 +1,53 @@
+---
+$schema: "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json"
+global:
+  fabricVersion: "2.5.12"
+  tls: false
+
+orgs:
+  - organization:
+      name: Orderer
+      domain: orderer.example.com
+    orderers:
+      - groupName: group1
+        prefix: orderer
+        type: solo
+        instances: 1
+  - organization:
+      name: Org1
+      domain: org1.example.com
+    peer:
+      instances: 2
+  - organization:
+      name: Org2
+      domain: org2.example.com
+    peer:
+      instances: 1
+
+channels:
+  - name: my-channel1
+    orgs:
+      - name: Org1
+        peers: [peer0]
+      - name: Org2
+        peers: [peer0]
+  - name: my-channel2
+    orgs:
+      - name: Org1
+        peers: [peer0]
+      - name: Org2
+        peers: [peer0]
+
+chaincodes:
+  - name: duplicateChaincode
+    version: "1.0"
+    lang: node
+    channel: my-channel1
+    directory: "./chaincodes/chaincode-kv-node"
+    endorsement: "OR('Org1MSP.member', 'Org2MSP.member')"
+  - name: duplicateChaincode
+    version: "1.0"
+    lang: node
+    channel: my-channel2
+    directory: "./chaincodes/chaincode-kv-node"
+    endorsement: "OR('Org1MSP.member', 'Org2MSP.member')"

samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml

@@ -55,4 +55,4 @@ chaincodes:
       - name: both-orgs-collection
         orgNames:
           - Org1
-          - Org2
+          - Org2

src/extend-config/extendChaincodesConfig.ts

@@ -37,11 +37,31 @@ const createPrivateCollectionConfig = (
   };
 };
 
+const checkUniqueChaincodeNames = (allChannelsConfig: any): void => {
+  const chaincodeNames = new Set<string>();
+
+  const allChaincodes: ChaincodeJson[] = [];
+
+  Object.values(allChannelsConfig.channels || {}).forEach((channel: any) => {
+    if (channel.chaincodes) {
+      allChaincodes.push(...channel.chaincodes);
+    }
+  });
+
+  allChaincodes.forEach((chaincode) => {
+    if (chaincodeNames.has(chaincode.name)) {
+      throw new Error(`Chaincode name '${chaincode.name}' is not unique across channels.`);
+    }
+    chaincodeNames.add(chaincode.name);
+  });
+};
+
 const extendChaincodesConfig = (
   chaincodes: ChaincodeJson[],
   transformedChannels: ChannelConfig[],
   network: Global,
 ): ChaincodeConfig[] => {
+  checkUniqueChaincodeNames(chaincodes);
   return chaincodes.map((chaincode) => {
     const channel = transformedChannels.find((c) => c.name === chaincode.channel);
     if (!channel) throw new Error(`No matching channel with name '${chaincode.channel}'`);

src/extend-config/extendConfig.ts

@@ -4,6 +4,7 @@ import { extendOrgsConfig } from "./extendOrgsConfig";
 import extendGlobal from "./extendGlobal";
 import extendChannelsConfig from "./extendChannelsConfig";
 import extendChaincodesConfig from "./extendChaincodesConfig";
+import checkUniqueChaincodeNames from "./extendChaincodesConfig";
 import extendHooksConfig from "./extendHooksConfig";
 import { distinctOrdererHeads, mergeOrdererGroups } from "./mergeOrdererGroups";
 
@@ -22,6 +23,7 @@ const extendConfig = (json: FabloConfigJson): FabloConfigExtended => {
   const orderedHeadsDistinct = distinctOrdererHeads(ordererGroups);
 
   const channels = extendChannelsConfig(channelsJson, orgs, ordererGroups);
+  checkUniqueChaincodeNames(chaincodesJson, channels, global);
   const chaincodes = extendChaincodesConfig(chaincodesJson, channels, global);
   const hooks = extendHooksConfig(hooksJson);