epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-26 03:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed script bugs "SendTransaction failed: orderers is nil".

Browse source 
Signed-off-by: 暾暾 <631078133@qq.com>
This commit is contained in:
暾暾 2020-08-28 03:21:10 +08:00
parent c1424748b0
commit 7a0f5b7b71
3 changed files with 69 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
test-network/organizations/ccp-generate.sh
View file

@ -5,35 +5,44 @@ function one_line_pem {
} }
function json_ccp { function json_ccp {
local PP=$(one_line_pem $4) local OP=$(one_line_pem $5)
local CP=$(one_line_pem $5) local PP=$(one_line_pem $6)
local CP=$(one_line_pem $7)
sed -e "s/\${ORG}/$1/" \ sed -e "s/\${ORG}/$1/" \
-e "s/\${P0PORT}/$2/" \ -e "s/\${ORDERERPORT}/$2/" \
-e "s/\${CAPORT}/$3/" \ -e "s/\${P0PORT}/$3/" \
-e "s/\${CAPORT}/$4/" \
-e "s#\${ORDERERPEM}#$OP#" \
-e "s#\${PEERPEM}#$PP#" \ -e "s#\${PEERPEM}#$PP#" \
-e "s#\${CAPEM}#$CP#" \ -e "s#\${CAPEM}#$CP#" \
organizations/ccp-template.json organizations/ccp-template.json
} }
function yaml_ccp { function yaml_ccp {
local PP=$(one_line_pem $4) local OP=$(one_line_pem $5)
local CP=$(one_line_pem $5) local PP=$(one_line_pem $6)
local CP=$(one_line_pem $7)
sed -e "s/\${ORG}/$1/" \ sed -e "s/\${ORG}/$1/" \
-e "s/\${P0PORT}/$2/" \ -e "s/\${ORDERERPORT}/$2/" \
-e "s/\${CAPORT}/$3/" \ -e "s/\${P0PORT}/$3/" \
-e "s/\${CAPORT}/$4/" \
-e "s#\${ORDERERPEM}#$OP#" \
-e "s#\${PEERPEM}#$PP#" \ -e "s#\${PEERPEM}#$PP#" \
-e "s#\${CAPEM}#$CP#" \ -e "s#\${CAPEM}#$CP#" \
organizations/ccp-template.yaml | sed -e $'s/\\\\n/\\\n /g' organizations/ccp-template.yaml | sed -e $'s/\\\\n/\\\n /g'
} }
ORDERERPORT=7050
ORDERERPEM=organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
ORG=1 ORG=1
P0PORT=7051 P0PORT=7051
CAPORT=7054 CAPORT=7054
PEERPEM=organizations/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem PEERPEM=organizations/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
CAPEM=organizations/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem CAPEM=organizations/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem
echo "$(json_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.json echo "$(json_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.json
echo "$(yaml_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.yaml echo "$(yaml_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.yaml
ORG=2 ORG=2
P0PORT=9051 P0PORT=9051
@ -41,5 +50,5 @@ CAPORT=8054
PEERPEM=organizations/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem PEERPEM=organizations/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
CAPEM=organizations/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem CAPEM=organizations/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem
echo "$(json_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.json echo "$(json_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.json
echo "$(yaml_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.yaml echo "$(yaml_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.yaml

26
test-network/organizations/ccp-template.json
View file

@ -45,5 +45,31 @@
"verify": false "verify": false
} }
} }
},
"channels": {
"mychannel": {
"orderers": ["orderer.example.com"],
"peers": {
"peer0.org${ORG}.example.com": {
"endorsingPeer": true,
"chaincodeQuery": true,
"ledgerQuery": true,
"eventSource": true,
"discover": true
}
}
}
},
"orderers": {
"orderer.example.com": {
"url": "grpcs://localhost:${ORDERERPORT}",
"tlsCACerts": {
"pem": "${ORDERERPEM}"
},
"grpcOptions": {
"ssl-target-name-override": "orderer.example.com",
"hostnameOverride": "orderer.example.com"
}
}
} }
} }

22
test-network/organizations/ccp-template.yaml
View file

@ -33,3 +33,25 @@ certificateAuthorities:
${CAPEM} ${CAPEM}
httpOptions: httpOptions:
verify: false verify: false
channels:
mychannel:
orderers:
- orderer.example.com
peers:
peer0.org${ORG}.example.com:
endorsingPeer: true
chaincodeQuery: true
ledgerQuery: true
eventSource: true
discover: true
orderers:
orderer.example.com:
url: grpcs://localhost:${ORDERERPORT}
tlsCACerts:
pem: |
${ORDERERPEM}
grpcOptions:
ssl-target-name-override: orderer.example.com
hostnameOverride: orderer.example.com