From 600481eb7a0e19eb2a5f2160f7b646fcd2f57bbe Mon Sep 17 00:00:00 2001 From: Sanket Teli Date: Fri, 2 Aug 2024 20:29:30 +0530 Subject: [PATCH 1/5] removed the unused templates Signed-off-by: Sanket Teli --- e2e/__snapshots__/extendConfig.test.ts.snap | 16 ++++---- ...1chaincode-raft-explorer.json.test.ts.snap | 4 ++ ...fig-hlf2-1org-1chaincode.json.test.ts.snap | 4 ++ ...2-2orgs-2chaincodes-raft.yaml.test.ts.snap | 4 ++ ...1chaincode-raft-explorer.json.test.ts.snap | 4 ++ e2e/__snapshots__/fabloCommands.test.ts.snap | 22 +++++------ .../fablo-config-hlf2-1org-1chaincode.json | 2 +- .../fabric-docker/commands-generated.sh | 4 +- .../chaincode-install-v1.4.sh | 39 ------------------- .../chaincode-upgrade-v1.4.sh | 39 ------------------- 10 files changed, 37 insertions(+), 101 deletions(-) delete mode 100644 src/setup-docker/templates/fabric-docker/commands-generated/chaincode-install-v1.4.sh delete mode 100644 src/setup-docker/templates/fabric-docker/commands-generated/chaincode-upgrade-v1.4.sh diff --git a/e2e/__snapshots__/extendConfig.test.ts.snap b/e2e/__snapshots__/extendConfig.test.ts.snap index b9dab976..b906f8d7 100644 --- a/e2e/__snapshots__/extendConfig.test.ts.snap +++ b/e2e/__snapshots__/extendConfig.test.ts.snap @@ -573,19 +573,19 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` ], "global": { "capabilities": { - "application": "V2_0", - "channel": "V2_0", + "application": "V2_5", + "channel": "V2_5", "isV2": true, - "orderer": "V2_0", + "orderer": "V2_5", }, "engine": "docker", - "fabricBaseosVersion": "2.4.7", + "fabricBaseosVersion": "2.5.9", "fabricCaVersion": "1.5.5", - "fabricCcenvVersion": "2.4.7", - "fabricJavaenvVersion": "2.4", - "fabricNodeenvVersion": "2.4", + "fabricCcenvVersion": "2.5.9", + "fabricJavaenvVersion": "2.5", + "fabricNodeenvVersion": "2.5", "fabricRecommendedNodeVersion": "16", - "fabricVersion": "2.4.7", + "fabricVersion": "2.5.9", "monitoring": { "loglevel": "info", }, diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap index 91103b2e..345f50b5 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap @@ -1,5 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +<<<<<<< HEAD exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = ` "/config /crypto-config @@ -3295,3 +3296,6 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre "e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +======= +exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `[]`; +>>>>>>> 93ccee8 (removed the unused templates) diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap index 24a92f05..3f22aabe 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap @@ -1,5 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +<<<<<<< HEAD exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "/config /crypto-config @@ -3156,3 +3157,6 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper fil "e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +======= +exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `[]`; +>>>>>>> 93ccee8 (removed the unused templates) diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap index ae98f511..5b7455fd 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap @@ -1,5 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +<<<<<<< HEAD exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = ` "/config /crypto-config @@ -5509,3 +5510,6 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro "e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +======= +exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `[]`; +>>>>>>> 93ccee8 (removed the unused templates) diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap index 0c017261..6412401a 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap @@ -1,5 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +<<<<<<< HEAD exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = ` "/config /crypto-config @@ -6023,3 +6024,6 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr "e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +======= +exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper files from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `[]`; +>>>>>>> 93ccee8 (removed the unused templates) diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap index bfdf6f6c..e56d710d 100644 --- a/e2e/__snapshots__/fabloCommands.test.ts.snap +++ b/e2e/__snapshots__/fabloCommands.test.ts.snap @@ -2427,15 +2427,15 @@ Validation warnings count: 0 =========================================================== { "global": { - "fabricVersion": "2.4.7", + "fabricVersion": "2.5.9", "tls": false, "engine": "docker", "peerDevMode": false, "fabricCaVersion": "1.5.5", - "fabricCcenvVersion": "2.4.7", - "fabricBaseosVersion": "2.4.7", - "fabricJavaenvVersion": "2.4", - "fabricNodeenvVersion": "2.4", + "fabricCcenvVersion": "2.5.9", + "fabricBaseosVersion": "2.5.9", + "fabricJavaenvVersion": "2.5", + "fabricNodeenvVersion": "2.5", "fabricRecommendedNodeVersion": "16", "paths": { "fabloConfig": "", @@ -2445,9 +2445,9 @@ Validation warnings count: 0 "loglevel": "info" }, "capabilities": { - "channel": "V2_0", - "orderer": "V2_0", - "application": "V2_0", + "channel": "V2_5", + "orderer": "V2_5", + "application": "V2_5", "isV2": true }, "tools": {} @@ -2909,7 +2909,7 @@ exports[`init should init simple fablo config 1`] = ` "{ "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.4.7", + "fabricVersion": "2.5.9", "tls": false, "engine": "docker", "peerDevMode": false @@ -2963,7 +2963,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = ` "{ "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.4.7", + "fabricVersion": "2.5.9", "tls": false, "engine": "docker", "peerDevMode": false @@ -3025,7 +3025,7 @@ exports[`init should init simple fablo config with node chaincode and rest api 1 "{ "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.4.7", + "fabricVersion": "2.5.9", "tls": false, "engine": "docker", "peerDevMode": false diff --git a/samples/fablo-config-hlf2-1org-1chaincode.json b/samples/fablo-config-hlf2-1org-1chaincode.json index 2aecb739..2188ecbd 100644 --- a/samples/fablo-config-hlf2-1org-1chaincode.json +++ b/samples/fablo-config-hlf2-1org-1chaincode.json @@ -1,7 +1,7 @@ { "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.4.7", + "fabricVersion": "2.5.9", "tls": false }, "orgs": [ diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh index 8068e00e..08b9d472 100644 --- a/src/setup-docker/templates/fabric-docker/commands-generated.sh +++ b/src/setup-docker/templates/fabric-docker/commands-generated.sh @@ -83,9 +83,7 @@ installChaincodes() { local version="<%= chaincode.version %>" <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); -%> <% } -%> - <% } else { -%> - <%- include('commands-generated/chaincode-install-v1.4.sh', { chaincode, global }); -%> - <% } -%> + <% } else echo "Warning! Skipping chaincode '<%= chaincode.name %>' installation. Chaincode directory is empty." echo "Looked in dir: '$CHAINCODES_BASE_DIR/<%= chaincode.directory %>'" diff --git a/src/setup-docker/templates/fabric-docker/commands-generated/chaincode-install-v1.4.sh b/src/setup-docker/templates/fabric-docker/commands-generated/chaincode-install-v1.4.sh deleted file mode 100644 index cd1ac0e3..00000000 --- a/src/setup-docker/templates/fabric-docker/commands-generated/chaincode-install-v1.4.sh +++ /dev/null @@ -1,39 +0,0 @@ -<%/* - Chaincode install for V1 capabilities. - - Required template parameters: - - chaincode - - global -*/-%> -chaincodeBuild <% -%> - "<%= chaincode.name %>" <% -%> - "<%= chaincode.lang %>" <% -%> - "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>" <% -%> - "<%= global.fabricRecommendedNodeVersion %>" -<% chaincode.channel.orgs.forEach((org) => { -%> - <% org.peers.forEach((peer) => { -%> - printHeadline "Installing '<%= chaincode.name %>' on <%= chaincode.channel.name %>/<%= org.name %>/<%= peer.name %>" "U1F60E" - chaincodeInstall <% -%> - "<%= org.cli.address %>" <% -%> - "<%= peer.fullAddress %>" <% -%> - "<%= chaincode.channel.name %>" <% -%> - "<%= chaincode.name %>" <% -%> - "<%= chaincode.version %>" <% -%> - "<%= chaincode.lang %>" <% -%> - "<%= chaincode.channel.ordererHead.fullAddress %>" <% -%> - "<%= !global.tls ? '' : `crypto-orderer/tlsca.${chaincode.channel.ordererHead.domain}-cert.pem` %>" - <% }) -%> -<% }) -%> -printItalics "Instantiating chaincode '<%= chaincode.name %>' on channel '<%= chaincode.channel.name %>' as '<%= chaincode.instantiatingOrg.name %>'" "U1F618" -chaincodeInstantiate <% -%> - "<%= chaincode.instantiatingOrg.cli.address %>" <% -%> - "<%= chaincode.instantiatingOrg.headPeer.fullAddress %>" <% -%> - "<%= chaincode.channel.name %>" <% -%> - "<%= chaincode.name %>" <% -%> - "<%= chaincode.version %>" <% -%> - "<%= chaincode.lang %>" <% -%> - "<%= chaincode.channel.ordererHead.fullAddress %>" <% -%> - '<%- chaincode.init %>' <% -%> - "<%- chaincode.endorsement %>" <% -%> - "<%= !global.tls ? '' : `crypto-orderer/tlsca.${chaincode.channel.ordererHead.domain}-cert.pem` %>" <% -%> - "<%= chaincode.privateDataConfigFile || '' %>" diff --git a/src/setup-docker/templates/fabric-docker/commands-generated/chaincode-upgrade-v1.4.sh b/src/setup-docker/templates/fabric-docker/commands-generated/chaincode-upgrade-v1.4.sh deleted file mode 100644 index 89777ad4..00000000 --- a/src/setup-docker/templates/fabric-docker/commands-generated/chaincode-upgrade-v1.4.sh +++ /dev/null @@ -1,39 +0,0 @@ -<%/* - Upgrade chaincode for V1 capabilities. - - Required bash variables: - - version - Required template parameters: - - chaincode - - global -*/-%> -chaincodeBuild <% -%> - "<%= chaincode.name %>" <% -%> - "<%= chaincode.lang %>" <% -%> - "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>" -<% chaincode.channel.orgs.forEach((org) => { -%> - <% org.peers.forEach((peer) => { %> - printHeadline "Installing '<%= chaincode.name %>' on <%= chaincode.channel.name %>/<%= org.name %>/<%= peer.name %>" "U1F60E" - chaincodeInstall <% -%> - "<%= org.cli.address %>" <% -%> - "<%= peer.fullAddress %>" <% -%> - "<%= chaincode.channel.name %>" <% -%> - "<%= chaincode.name %>" <% -%> - "$version" <% -%> - "<%= chaincode.lang %>" <% -%> - "<%= chaincode.channel.ordererHead.fullAddress %>" <% -%> - "<%= !global.tls ? '' : `crypto-orderer/tlsca.${chaincode.channel.ordererHead.domain}-cert.pem` %>" - <% }) -%> -<% }) -%> -printItalics "Upgrading as '<%= chaincode.instantiatingOrg.name %>'. '<%= chaincode.name %>' on channel '<%= chaincode.channel.name %>'" "U1F618" -chaincodeUpgrade <% -%> - "<%= chaincode.instantiatingOrg.cli.address %>" <% -%> - "<%= chaincode.instantiatingOrg.headPeer.fullAddress %>" <% -%> - "<%= chaincode.channel.name %>" "<%= chaincode.name %>" <% -%> - "$version" <% -%> - "<%= chaincode.lang %>" <% -%> - "<%= chaincode.channel.ordererHead.fullAddress %>" <% -%> - '<%- chaincode.init %>' <% -%> - "<%- chaincode.endorsement %>" <% -%> - "<%= !global.tls ? '' : `crypto-orderer/tlsca.${chaincode.channel.ordererHead.domain}-cert.pem` %>" <% -%> - "<%= chaincode.privateDataConfigFile || '' %>" From c5a5be83154c7a3d4e7eaddaa569496350fca292 Mon Sep 17 00:00:00 2001 From: Sanket Teli Date: Fri, 2 Aug 2024 20:48:12 +0530 Subject: [PATCH 2/5] resolved the error Signed-off-by: Sanket Teli --- ...1chaincode-raft-explorer.json.test.ts.snap | 22 ++++++++++ ...fig-hlf2-1org-1chaincode.json.test.ts.snap | 40 +++++++++++++++++++ ...2-2orgs-2chaincodes-raft.yaml.test.ts.snap | 22 ++++++++++ ...1chaincode-raft-explorer.json.test.ts.snap | 22 ++++++++++ .../fabric-docker/commands-generated.sh | 2 +- 5 files changed, 107 insertions(+), 1 deletion(-) diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap index 345f50b5..59b2e099 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap @@ -1,6 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = ` "/config /crypto-config @@ -1706,7 +1709,11 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -1832,13 +1839,21 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) +>>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -3216,7 +3231,11 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi +<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) +======= + (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) +>>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -3296,6 +3315,9 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre "e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +<<<<<<< HEAD ======= exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `[]`; >>>>>>> 93ccee8 (removed the unused templates) +======= +>>>>>>> 7a0da9f (resolved the error) diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap index 3f22aabe..70275597 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap @@ -1,6 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "/config /crypto-config @@ -13,11 +16,19 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e ################################################################################ Capabilities: Channel: &ChannelCapabilities +<<<<<<< HEAD V2_0: true Orderer: &OrdererCapabilities V2_0: true Application: &ApplicationCapabilities V2_0: true +======= + V2_5: true + Orderer: &OrdererCapabilities + V2_5: true + Application: &ApplicationCapabilities + V2_5: true +>>>>>>> 7a0da9f (resolved the error) ################################################################################ # CHANNEL Defaults @@ -1449,6 +1460,7 @@ CHAINCODES_BASE_DIR= COMPOSE_PROJECT_NAME= LOGGING_LEVEL=info +<<<<<<< HEAD FABRIC_VERSION=2.4.7 FABRIC_CA_VERSION=1.5.5 FABRIC_CA_POSTGRES_VERSION=14 @@ -1456,6 +1468,15 @@ FABRIC_CCENV_VERSION=2.4.7 FABRIC_BASEOS_VERSION=2.4.7 FABRIC_JAVAENV_VERSION=2.4 FABRIC_NODEENV_VERSION=2.4 +======= +FABRIC_VERSION=2.5.9 +FABRIC_CA_VERSION=1.5.5 +FABRIC_CA_POSTGRES_VERSION=14 +FABRIC_CCENV_VERSION=2.5.9 +FABRIC_BASEOS_VERSION=2.5.9 +FABRIC_JAVAENV_VERSION=2.5 +FABRIC_NODEENV_VERSION=2.5 +>>>>>>> 7a0da9f (resolved the error) RECOMMENDED_NODE_VERSION=16 ROOT_CA_ADMIN_NAME=admin @@ -1656,7 +1677,11 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -1787,13 +1812,21 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) +>>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -3081,7 +3114,11 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi +<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) +======= + (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) +>>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -3157,6 +3194,9 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper fil "e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +<<<<<<< HEAD ======= exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `[]`; >>>>>>> 93ccee8 (removed the unused templates) +======= +>>>>>>> 7a0da9f (resolved the error) diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap index 5b7455fd..114c5d86 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap @@ -1,6 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = ` "/config /crypto-config @@ -3484,7 +3487,11 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -3718,13 +3725,21 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) +>>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -5424,7 +5439,11 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi +<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) +======= + (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) +>>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -5510,6 +5529,9 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro "e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +<<<<<<< HEAD ======= exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `[]`; >>>>>>> 93ccee8 (removed the unused templates) +======= +>>>>>>> 7a0da9f (resolved the error) diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap index 6412401a..8060bffb 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap @@ -1,6 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = ` "/config /crypto-config @@ -3822,7 +3825,11 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -3980,13 +3987,21 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) +>>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" +<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) +======= + (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) +>>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -5936,7 +5951,11 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi +<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) +======= + (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) +>>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -6024,6 +6043,9 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr "e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; +<<<<<<< HEAD ======= exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper files from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `[]`; >>>>>>> 93ccee8 (removed the unused templates) +======= +>>>>>>> 7a0da9f (resolved the error) diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh index 08b9d472..8a314211 100644 --- a/src/setup-docker/templates/fabric-docker/commands-generated.sh +++ b/src/setup-docker/templates/fabric-docker/commands-generated.sh @@ -83,7 +83,7 @@ installChaincodes() { local version="<%= chaincode.version %>" <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); -%> <% } -%> - <% } + <% } -%> else echo "Warning! Skipping chaincode '<%= chaincode.name %>' installation. Chaincode directory is empty." echo "Looked in dir: '$CHAINCODES_BASE_DIR/<%= chaincode.directory %>'" From 509fdd92e944149954347ac37d1eb0af4b2e8e6b Mon Sep 17 00:00:00 2001 From: Sanket Teli Date: Tue, 6 Aug 2024 12:13:28 +0530 Subject: [PATCH 3/5] some minor fixes regarding fabric_version Signed-off-by: Sanket Teli --- e2e/__snapshots__/extendConfig.test.ts.snap | 16 +++++++------- ...fig-hlf2-1org-1chaincode.json.test.ts.snap | 20 ++++++++++++++++- e2e/__snapshots__/fabloCommands.test.ts.snap | 22 +++++++++---------- .../fablo-config-hlf2-1org-1chaincode.json | 2 +- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/e2e/__snapshots__/extendConfig.test.ts.snap b/e2e/__snapshots__/extendConfig.test.ts.snap index b906f8d7..b9dab976 100644 --- a/e2e/__snapshots__/extendConfig.test.ts.snap +++ b/e2e/__snapshots__/extendConfig.test.ts.snap @@ -573,19 +573,19 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` ], "global": { "capabilities": { - "application": "V2_5", - "channel": "V2_5", + "application": "V2_0", + "channel": "V2_0", "isV2": true, - "orderer": "V2_5", + "orderer": "V2_0", }, "engine": "docker", - "fabricBaseosVersion": "2.5.9", + "fabricBaseosVersion": "2.4.7", "fabricCaVersion": "1.5.5", - "fabricCcenvVersion": "2.5.9", - "fabricJavaenvVersion": "2.5", - "fabricNodeenvVersion": "2.5", + "fabricCcenvVersion": "2.4.7", + "fabricJavaenvVersion": "2.4", + "fabricNodeenvVersion": "2.4", "fabricRecommendedNodeVersion": "16", - "fabricVersion": "2.5.9", + "fabricVersion": "2.4.7", "monitoring": { "loglevel": "info", }, diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap index 70275597..411618a6 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap @@ -16,6 +16,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e ################################################################################ Capabilities: Channel: &ChannelCapabilities +<<<<<<< HEAD <<<<<<< HEAD V2_0: true Orderer: &OrdererCapabilities @@ -24,11 +25,18 @@ Capabilities: V2_0: true ======= V2_5: true +======= + V2_0: true +>>>>>>> fbcd816 (some minor fixes regarding fabric_version) Orderer: &OrdererCapabilities - V2_5: true + V2_0: true Application: &ApplicationCapabilities +<<<<<<< HEAD V2_5: true >>>>>>> 7a0da9f (resolved the error) +======= + V2_0: true +>>>>>>> fbcd816 (some minor fixes regarding fabric_version) ################################################################################ # CHANNEL Defaults @@ -1460,6 +1468,7 @@ CHAINCODES_BASE_DIR= COMPOSE_PROJECT_NAME= LOGGING_LEVEL=info +<<<<<<< HEAD <<<<<<< HEAD FABRIC_VERSION=2.4.7 FABRIC_CA_VERSION=1.5.5 @@ -1477,6 +1486,15 @@ FABRIC_BASEOS_VERSION=2.5.9 FABRIC_JAVAENV_VERSION=2.5 FABRIC_NODEENV_VERSION=2.5 >>>>>>> 7a0da9f (resolved the error) +======= +FABRIC_VERSION=2.4.7 +FABRIC_CA_VERSION=1.5.5 +FABRIC_CA_POSTGRES_VERSION=14 +FABRIC_CCENV_VERSION=2.4.7 +FABRIC_BASEOS_VERSION=2.4.7 +FABRIC_JAVAENV_VERSION=2.4 +FABRIC_NODEENV_VERSION=2.4 +>>>>>>> fbcd816 (some minor fixes regarding fabric_version) RECOMMENDED_NODE_VERSION=16 ROOT_CA_ADMIN_NAME=admin diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap index e56d710d..bfdf6f6c 100644 --- a/e2e/__snapshots__/fabloCommands.test.ts.snap +++ b/e2e/__snapshots__/fabloCommands.test.ts.snap @@ -2427,15 +2427,15 @@ Validation warnings count: 0 =========================================================== { "global": { - "fabricVersion": "2.5.9", + "fabricVersion": "2.4.7", "tls": false, "engine": "docker", "peerDevMode": false, "fabricCaVersion": "1.5.5", - "fabricCcenvVersion": "2.5.9", - "fabricBaseosVersion": "2.5.9", - "fabricJavaenvVersion": "2.5", - "fabricNodeenvVersion": "2.5", + "fabricCcenvVersion": "2.4.7", + "fabricBaseosVersion": "2.4.7", + "fabricJavaenvVersion": "2.4", + "fabricNodeenvVersion": "2.4", "fabricRecommendedNodeVersion": "16", "paths": { "fabloConfig": "", @@ -2445,9 +2445,9 @@ Validation warnings count: 0 "loglevel": "info" }, "capabilities": { - "channel": "V2_5", - "orderer": "V2_5", - "application": "V2_5", + "channel": "V2_0", + "orderer": "V2_0", + "application": "V2_0", "isV2": true }, "tools": {} @@ -2909,7 +2909,7 @@ exports[`init should init simple fablo config 1`] = ` "{ "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.5.9", + "fabricVersion": "2.4.7", "tls": false, "engine": "docker", "peerDevMode": false @@ -2963,7 +2963,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = ` "{ "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.5.9", + "fabricVersion": "2.4.7", "tls": false, "engine": "docker", "peerDevMode": false @@ -3025,7 +3025,7 @@ exports[`init should init simple fablo config with node chaincode and rest api 1 "{ "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.5.9", + "fabricVersion": "2.4.7", "tls": false, "engine": "docker", "peerDevMode": false diff --git a/samples/fablo-config-hlf2-1org-1chaincode.json b/samples/fablo-config-hlf2-1org-1chaincode.json index 2188ecbd..2aecb739 100644 --- a/samples/fablo-config-hlf2-1org-1chaincode.json +++ b/samples/fablo-config-hlf2-1org-1chaincode.json @@ -1,7 +1,7 @@ { "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json", "global": { - "fabricVersion": "2.5.9", + "fabricVersion": "2.4.7", "tls": false }, "orgs": [ From 8241083dabfbc83c559cb42865d796e730170491 Mon Sep 17 00:00:00 2001 From: Sanket Teli Date: Tue, 6 Aug 2024 13:06:14 +0530 Subject: [PATCH 4/5] removed all the version 1.4 templates Signed-off-by: Sanket Teli --- src/setup-docker/templates/fabric-docker/commands-generated.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh index 8a314211..94649a53 100644 --- a/src/setup-docker/templates/fabric-docker/commands-generated.sh +++ b/src/setup-docker/templates/fabric-docker/commands-generated.sh @@ -104,8 +104,6 @@ installChaincode() { if [ -n "$(ls "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>")" ]; then <% if (global.capabilities.isV2) { -%> <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); %> - <% } else { -%> - <%- include('commands-generated/chaincode-install-v1.4.sh', { chaincode, global }); %> <% } -%> else echo "Warning! Skipping chaincode '<%= chaincode.name %>' install. Chaincode directory is empty." From 0c7c081e480ff082a8ebb253005fdddf531c9420 Mon Sep 17 00:00:00 2001 From: Sanket Teli Date: Wed, 7 Aug 2024 18:17:08 +0530 Subject: [PATCH 5/5] rebase and updated the snapshots Signed-off-by: Sanket Teli --- ...1chaincode-raft-explorer.json.test.ts.snap | 26 -------- ...fig-hlf2-1org-1chaincode.json.test.ts.snap | 62 ------------------- ...2-2orgs-2chaincodes-raft.yaml.test.ts.snap | 26 -------- ...1chaincode-raft-explorer.json.test.ts.snap | 26 -------- 4 files changed, 140 deletions(-) diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap index 59b2e099..91103b2e 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap @@ -1,9 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = ` "/config /crypto-config @@ -1709,11 +1705,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -1839,21 +1831,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) ->>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -3231,11 +3215,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi -<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) -======= - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) ->>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -3315,9 +3295,3 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre "e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; -<<<<<<< HEAD -======= -exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `[]`; ->>>>>>> 93ccee8 (removed the unused templates) -======= ->>>>>>> 7a0da9f (resolved the error) diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap index 411618a6..24a92f05 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap @@ -1,9 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = ` "/config /crypto-config @@ -16,27 +12,11 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e ################################################################################ Capabilities: Channel: &ChannelCapabilities -<<<<<<< HEAD -<<<<<<< HEAD V2_0: true Orderer: &OrdererCapabilities V2_0: true Application: &ApplicationCapabilities V2_0: true -======= - V2_5: true -======= - V2_0: true ->>>>>>> fbcd816 (some minor fixes regarding fabric_version) - Orderer: &OrdererCapabilities - V2_0: true - Application: &ApplicationCapabilities -<<<<<<< HEAD - V2_5: true ->>>>>>> 7a0da9f (resolved the error) -======= - V2_0: true ->>>>>>> fbcd816 (some minor fixes regarding fabric_version) ################################################################################ # CHANNEL Defaults @@ -1468,25 +1448,6 @@ CHAINCODES_BASE_DIR= COMPOSE_PROJECT_NAME= LOGGING_LEVEL=info -<<<<<<< HEAD -<<<<<<< HEAD -FABRIC_VERSION=2.4.7 -FABRIC_CA_VERSION=1.5.5 -FABRIC_CA_POSTGRES_VERSION=14 -FABRIC_CCENV_VERSION=2.4.7 -FABRIC_BASEOS_VERSION=2.4.7 -FABRIC_JAVAENV_VERSION=2.4 -FABRIC_NODEENV_VERSION=2.4 -======= -FABRIC_VERSION=2.5.9 -FABRIC_CA_VERSION=1.5.5 -FABRIC_CA_POSTGRES_VERSION=14 -FABRIC_CCENV_VERSION=2.5.9 -FABRIC_BASEOS_VERSION=2.5.9 -FABRIC_JAVAENV_VERSION=2.5 -FABRIC_NODEENV_VERSION=2.5 ->>>>>>> 7a0da9f (resolved the error) -======= FABRIC_VERSION=2.4.7 FABRIC_CA_VERSION=1.5.5 FABRIC_CA_POSTGRES_VERSION=14 @@ -1494,7 +1455,6 @@ FABRIC_CCENV_VERSION=2.4.7 FABRIC_BASEOS_VERSION=2.4.7 FABRIC_JAVAENV_VERSION=2.4 FABRIC_NODEENV_VERSION=2.4 ->>>>>>> fbcd816 (some minor fixes regarding fabric_version) RECOMMENDED_NODE_VERSION=16 ROOT_CA_ADMIN_NAME=admin @@ -1695,11 +1655,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -1830,21 +1786,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) ->>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -3132,11 +3080,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi -<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) -======= - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) ->>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -3212,9 +3156,3 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper fil "e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; -<<<<<<< HEAD -======= -exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `[]`; ->>>>>>> 93ccee8 (removed the unused templates) -======= ->>>>>>> 7a0da9f (resolved the error) diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap index 114c5d86..ae98f511 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap @@ -1,9 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = ` "/config /crypto-config @@ -3487,11 +3483,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -3725,21 +3717,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) ->>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -5439,11 +5423,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi -<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) -======= - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) ->>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -5529,9 +5509,3 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro "e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/hooks/post-generate.sh", ] `; -<<<<<<< HEAD -======= -exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `[]`; ->>>>>>> 93ccee8 (removed the unused templates) -======= ->>>>>>> 7a0da9f (resolved the error) diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap index 8060bffb..0c017261 100644 --- a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap +++ b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap @@ -1,9 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 7a0da9f (resolved the error) exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = ` "/config /crypto-config @@ -3825,11 +3821,7 @@ generateArtifacts() { startNetwork() { printHeadline "Starting network" "U1F680" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose up -d) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose up -d) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } @@ -3987,21 +3979,13 @@ printStartSuccessInfo() { stopNetwork() { printHeadline "Stopping network" "U1F68F" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose stop) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose stop) ->>>>>>> 7a0da9f (resolved the error) sleep 4 } networkDown() { printHeadline "Destroying network" "U1F916" -<<<<<<< HEAD (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker compose down) -======= - (cd "$FABLO_NETWORK_ROOT"/fabric-docker && docker-compose down) ->>>>>>> 7a0da9f (resolved the error) printf "Removing chaincode containers & images... \\U1F5D1 \\n" for container in $(docker ps -a | grep "dev-peer0.org1.example.com-chaincode1" | awk '{print $1}'); do @@ -5951,11 +5935,7 @@ __cloneSnapshot() { (cd "$target_dir" && eval "$hook_cmd") fi -<<<<<<< HEAD (cd "$target_dir/fablo-target/fabric-docker" && docker compose up --no-start) -======= - (cd "$target_dir/fablo-target/fabric-docker" && docker-compose up --no-start) ->>>>>>> 7a0da9f (resolved the error) for node in $(__getCASQLiteNodes); do echo "Restoring $node..." @@ -6043,9 +6023,3 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr "e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/hooks/post-generate.sh", ] `; -<<<<<<< HEAD -======= -exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper files from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `[]`; ->>>>>>> 93ccee8 (removed the unused templates) -======= ->>>>>>> 7a0da9f (resolved the error)