From f3fc08d95f5f65ea29cb333686675f2d14bca6b8 Mon Sep 17 00:00:00 2001 From: nikhil550 Date: Fri, 20 Mar 2020 10:54:35 -0400 Subject: [PATCH] Remove solo and kafka from test net configtx.yaml (#137) Signed-off-by: NIKHIL E GUPTA Co-authored-by: NIKHIL E GUPTA --- test-network/addOrg3/ccp-template.json | 2 +- test-network/addOrg3/ccp-template.yaml | 2 +- test-network/configtx/configtx.yaml | 1 - test-network/organizations/ccp-template.json | 2 +- test-network/organizations/ccp-template.yaml | 2 +- test-network/scripts/createChannel.sh | 1 - test-network/scripts/deployCC.sh | 1 - 7 files changed, 4 insertions(+), 7 deletions(-) diff --git a/test-network/addOrg3/ccp-template.json b/test-network/addOrg3/ccp-template.json index b4fb3dfb45..2b19d1b9bf 100644 --- a/test-network/addOrg3/ccp-template.json +++ b/test-network/addOrg3/ccp-template.json @@ -1,5 +1,5 @@ { - "name": "first-network-org${ORG}", + "name": "test-network-org${ORG}", "version": "1.0.0", "client": { "organization": "Org${ORG}", diff --git a/test-network/addOrg3/ccp-template.yaml b/test-network/addOrg3/ccp-template.yaml index dec3f05930..7e65965f0c 100644 --- a/test-network/addOrg3/ccp-template.yaml +++ b/test-network/addOrg3/ccp-template.yaml @@ -1,5 +1,5 @@ --- -name: first-network-org${ORG} +name: test-network-org${ORG} version: 1.0.0 client: organization: Org${ORG} diff --git a/test-network/configtx/configtx.yaml b/test-network/configtx/configtx.yaml index 9580184aef..684d3adeff 100644 --- a/test-network/configtx/configtx.yaml +++ b/test-network/configtx/configtx.yaml @@ -213,7 +213,6 @@ Application: &ApplicationDefaults Orderer: &OrdererDefaults # Orderer Type: The orderer implementation to start - # Available types are "solo" and "kafka" OrdererType: etcdraft EtcdRaft: diff --git a/test-network/organizations/ccp-template.json b/test-network/organizations/ccp-template.json index b4fb3dfb45..2b19d1b9bf 100755 --- a/test-network/organizations/ccp-template.json +++ b/test-network/organizations/ccp-template.json @@ -1,5 +1,5 @@ { - "name": "first-network-org${ORG}", + "name": "test-network-org${ORG}", "version": "1.0.0", "client": { "organization": "Org${ORG}", diff --git a/test-network/organizations/ccp-template.yaml b/test-network/organizations/ccp-template.yaml index dec3f05930..7e65965f0c 100755 --- a/test-network/organizations/ccp-template.yaml +++ b/test-network/organizations/ccp-template.yaml @@ -1,5 +1,5 @@ --- -name: first-network-org${ORG} +name: test-network-org${ORG} version: 1.0.0 client: organization: Org${ORG} diff --git a/test-network/scripts/createChannel.sh b/test-network/scripts/createChannel.sh index 27667fdac8..a87c55ed05 100755 --- a/test-network/scripts/createChannel.sh +++ b/test-network/scripts/createChannel.sh @@ -123,7 +123,6 @@ updateAnchorPeers() { verifyResult() { if [ $1 -ne 0 ]; then echo "!!!!!!!!!!!!!!! "$2" !!!!!!!!!!!!!!!!" - echo "========= ERROR !!! FAILED to execute End-2-End Scenario ===========" echo exit 1 fi diff --git a/test-network/scripts/deployCC.sh b/test-network/scripts/deployCC.sh index 3a7b83652c..8017305338 100755 --- a/test-network/scripts/deployCC.sh +++ b/test-network/scripts/deployCC.sh @@ -142,7 +142,6 @@ checkCommitReadiness() { echo "===================== Checking the commit readiness of the chaincode definition successful on peer0.org${ORG} on channel '$CHANNEL_NAME' ===================== " else echo "!!!!!!!!!!!!!!! After $MAX_RETRY attempts, Check commit readiness result on peer0.org${ORG} is INVALID !!!!!!!!!!!!!!!!" - echo "================== ERROR !!! FAILED to execute End-2-End Scenario ==================" echo exit 1 fi