Skip to content

Commit e204ebb

Browse files
nikhil550nikhil550
authored
Remove reference to 2.0 beta (#111)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
1 parent 3dbe116 commit e204ebb

File tree

7 files changed

+19
-15
lines changed

7 files changed

+19
-15
lines changed

‎test-network/addOrg3/fabric-ca/registerEnroll.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ function createOrg3 {
3434
echo "Register peer0"
3535
echo
3636
set -x
37-
fabric-ca-client register --caname ca-org3 --id.name peer0 --id.secret peer0pw --id.type peer --id.attrs '"hf.Registrar.Roles=peer"' --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem
37+
fabric-ca-client register --caname ca-org3 --id.name peer0 --id.secret peer0pw --id.type peer --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem
3838
set +x
3939

4040
echo
4141
echo "Register user"
4242
echo
4343
set -x
44-
fabric-ca-client register --caname ca-org3 --id.name user1 --id.secret user1pw --id.type client --id.attrs '"hf.Registrar.Roles=client"' --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem
44+
fabric-ca-client register --caname ca-org3 --id.name user1 --id.secret user1pw --id.type client --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem
4545
set +x
4646

4747
echo
4848
echo "Register the org admin"
4949
echo
5050
set -x
51-
fabric-ca-client register --caname ca-org3 --id.name org3admin --id.secret org3adminpw --id.type admin --id.attrs '"hf.Registrar.Roles=admin"' --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem
51+
fabric-ca-client register --caname ca-org3 --id.name org3admin --id.secret org3adminpw --id.type admin --tls.certfiles ${PWD}/fabric-ca/org3/tls-cert.pem
5252
set +x
5353

5454
mkdir -p ../organizations/peerOrganizations/org3.example.com/peers

‎test-network/docker/docker-compose-e2e.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ services:
6969
environment:
7070
- FABRIC_LOGGING_SPEC=INFO
7171
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
72+
- ORDERER_GENERAL_LISTENPORT=7050
7273
- ORDERER_GENERAL_GENESISMETHOD=file
7374
- ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block
7475
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP

‎test-network/docker/docker-compose-test-net.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ services:
2121
environment:
2222
- FABRIC_LOGGING_SPEC=INFO
2323
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
24+
- ORDERER_GENERAL_LISTENPORT=7050
2425
- ORDERER_GENERAL_GENESISMETHOD=file
2526
- ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block
2627
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP

‎test-network/network.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function printHelp() {
5050
echo " network.sh up"
5151
echo
5252
echo " Examples:"
53-
echo " network.sh up createChannel -ca -c mychannel -s couchdb -i 2.0.0-beta"
53+
echo " network.sh up createChannel -ca -c mychannel -s couchdb -i 2.0.0"
5454
echo " network.sh createChannel -c channelName"
5555
echo " network.sh deployCC -l javascript"
5656
}

‎test-network/organizations/cryptogen/crypto-config-orderer.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ OrdererOrgs:
1818
# ---------------------------------------------------------------------------
1919
Specs:
2020
- Hostname: orderer
21+
SANS:
22+
- localhost

‎test-network/organizations/fabric-ca/registerEnroll.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ function createOrg1 {
3434
echo "Register peer0"
3535
echo
3636
set -x
37-
fabric-ca-client register --caname ca-org1 --id.name peer0 --id.secret peer0pw --id.type peer --id.attrs '"hf.Registrar.Roles=peer"' --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem
37+
fabric-ca-client register --caname ca-org1 --id.name peer0 --id.secret peer0pw --id.type peer --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem
3838
set +x
3939

4040
echo
4141
echo "Register user"
4242
echo
4343
set -x
44-
fabric-ca-client register --caname ca-org1 --id.name user1 --id.secret user1pw --id.type client --id.attrs '"hf.Registrar.Roles=client"' --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem
44+
fabric-ca-client register --caname ca-org1 --id.name user1 --id.secret user1pw --id.type client --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem
4545
set +x
4646

4747
echo
4848
echo "Register the org admin"
4949
echo
5050
set -x
51-
fabric-ca-client register --caname ca-org1 --id.name org1admin --id.secret org1adminpw --id.type admin --id.attrs '"hf.Registrar.Roles=admin"' --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem
51+
fabric-ca-client register --caname ca-org1 --id.name org1admin --id.secret org1adminpw --id.type admin --tls.certfiles ${PWD}/organizations/fabric-ca/org1/tls-cert.pem
5252
set +x
5353

5454
mkdir -p organizations/peerOrganizations/org1.example.com/peers
@@ -142,21 +142,21 @@ function createOrg2 {
142142
echo "Register peer0"
143143
echo
144144
set -x
145-
fabric-ca-client register --caname ca-org2 --id.name peer0 --id.secret peer0pw --id.type peer --id.attrs '"hf.Registrar.Roles=peer"' --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem
145+
fabric-ca-client register --caname ca-org2 --id.name peer0 --id.secret peer0pw --id.type peer --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem
146146
set +x
147147

148148
echo
149149
echo "Register user"
150150
echo
151151
set -x
152-
fabric-ca-client register --caname ca-org2 --id.name user1 --id.secret user1pw --id.type client --id.attrs '"hf.Registrar.Roles=client"' --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem
152+
fabric-ca-client register --caname ca-org2 --id.name user1 --id.secret user1pw --id.type client --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem
153153
set +x
154154

155155
echo
156156
echo "Register the org admin"
157157
echo
158158
set -x
159-
fabric-ca-client register --caname ca-org2 --id.name org2admin --id.secret org2adminpw --id.type admin --id.attrs '"hf.Registrar.Roles=admin"' --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem
159+
fabric-ca-client register --caname ca-org2 --id.name org2admin --id.secret org2adminpw --id.type admin --tls.certfiles ${PWD}/organizations/fabric-ca/org2/tls-cert.pem
160160
set +x
161161

162162
mkdir -p organizations/peerOrganizations/org2.example.com/peers
@@ -250,14 +250,14 @@ function createOrderer {
250250
echo "Register orderer"
251251
echo
252252
set -x
253-
fabric-ca-client register --caname ca-orderer --id.name orderer --id.secret ordererpw --id.type orderer --id.attrs '"hf.Registrar.Roles=orderer"' --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
253+
fabric-ca-client register --caname ca-orderer --id.name orderer --id.secret ordererpw --id.type orderer --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
254254
set +x
255255

256256
echo
257257
echo "Register the orderer admin"
258258
echo
259259
set -x
260-
fabric-ca-client register --caname ca-orderer --id.name ordererAdmin --id.secret ordererAdminpw --id.type admin --id.attrs '"hf.Registrar.Roles=admin"' --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
260+
fabric-ca-client register --caname ca-orderer --id.name ordererAdmin --id.secret ordererAdminpw --id.type admin --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
261261
set +x
262262

263263
mkdir -p organizations/ordererOrganizations/example.com/orderers
@@ -269,7 +269,7 @@ function createOrderer {
269269
echo "## Generate the orderer msp"
270270
echo
271271
set -x
272-
fabric-ca-client enroll -u https://orderer:ordererpw@localhost:9054 --caname ca-orderer -M ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp --csr.hosts orderer.example.com --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
272+
fabric-ca-client enroll -u https://orderer:ordererpw@localhost:9054 --caname ca-orderer -M ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp --csr.hosts orderer.example.com --csr.hosts localhost --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
273273
set +x
274274

275275
cp ${PWD}/organizations/ordererOrganizations/example.com/msp/config.yaml ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/config.yaml
@@ -278,7 +278,7 @@ function createOrderer {
278278
echo "## Generate the orderer-tls certificates"
279279
echo
280280
set -x
281-
fabric-ca-client enroll -u https://orderer:ordererpw@localhost:9054 --caname ca-orderer -M ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls --enrollment.profile tls --csr.hosts orderer.example.com --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
281+
fabric-ca-client enroll -u https://orderer:ordererpw@localhost:9054 --caname ca-orderer -M ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls --enrollment.profile tls --csr.hosts orderer.example.com --csr.hosts localhost --tls.certfiles ${PWD}/organizations/fabric-ca/ordererOrg/tls-cert.pem
282282
set +x
283283

284284
cp ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/tlscacerts/* ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt

‎test-network/scripts/deployCC.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ checkCommitReadiness() {
126126
sleep $DELAY
127127
echo "Attempting to check the commit readiness of the chaincode definition on peer0.org${ORG} secs"
128128
set -x
129-
peer lifecycle chaincode checkcommitreadiness --channelID $CHANNEL_NAME --name fabcar $PEER_CONN_PARMS --version ${VERSION} --sequence ${VERSION} --output json --init-required >&log.txt
129+
peer lifecycle chaincode checkcommitreadiness --channelID $CHANNEL_NAME --name fabcar --version ${VERSION} --sequence ${VERSION} --output json --init-required >&log.txt
130130
res=$?
131131
set +x
132132
#test $res -eq 0 || continue

0 commit comments

Comments
 (0)