Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove solo and kafka comment from test-net configtx.yaml #137

Merged
merged 1 commit into from
Mar 20, 2020
Merged

Remove solo and kafka comment from test-net configtx.yaml #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test-network/addOrg3/ccp-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "first-network-org${ORG}",
"name": "test-network-org${ORG}",
"version": "1.0.0",
"client": {
"organization": "Org${ORG}",
Expand Down
2 changes: 1 addition & 1 deletion test-network/addOrg3/ccp-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: first-network-org${ORG}
name: test-network-org${ORG}
version: 1.0.0
client:
organization: Org${ORG}
Expand Down
1 change: 0 additions & 1 deletion test-network/configtx/configtx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ Application: &ApplicationDefaults
Orderer: &OrdererDefaults

# Orderer Type: The orderer implementation to start
# Available types are "solo" and "kafka"
OrdererType: etcdraft

EtcdRaft:
Expand Down
2 changes: 1 addition & 1 deletion test-network/organizations/ccp-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "first-network-org${ORG}",
"name": "test-network-org${ORG}",
"version": "1.0.0",
"client": {
"organization": "Org${ORG}",
Expand Down
2 changes: 1 addition & 1 deletion test-network/organizations/ccp-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: first-network-org${ORG}
name: test-network-org${ORG}
version: 1.0.0
client:
organization: Org${ORG}
Expand Down
1 change: 0 additions & 1 deletion test-network/scripts/createChannel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test-network/scripts/deployCC.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down