Skip to content

Commit

Permalink
Use common utility for path resolution.
Browse files Browse the repository at this point in the history 
Signed-off-by: Attila Klenik <[email protected]>
  • Loading branch information
@aklenik
aklenik committed Jul 16, 2018
1 parent 6cf2891 commit 6cb84f9
Show file tree
Hide file tree
Showing 22 changed files with 158 additions and 173 deletions.
16 changes: 8 additions & 8 deletions network/fabric/2-org-1-peer/composer-tls.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "src/contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
Expand All @@ -12,7 +12,7 @@
"url": "grpcs://localhost:7050",
"mspid": "OrdererMSP",
"mspconfig": "/etc/hyperledger/msp/orderer/tls/ca.crt",
"cert": "/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt",
"cert": "network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt",
"hostname": "orderer.example.com",
"hosturl": "orderer.example.com:7050"
}
Expand All @@ -32,8 +32,8 @@
"name": "Org1",
"mspid": "Org1MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org1.example.com"
],
Expand All @@ -45,8 +45,8 @@
"name": "Org2",
"mspid": "Org2MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org2.example.com"
],
Expand All @@ -60,7 +60,7 @@
"url": "grpcs://localhost:7051",
"eventUrl": "grpcs://localhost:7053",
"hostname": "peer0.org1.example.com",
"cert" : "/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -69,7 +69,7 @@
"url": "grpcs://localhost:8051",
"eventUrl": "grpcs://localhost:8053",
"hostname": "peer0.org2.example.com",
"cert" : "/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand Down
10 changes: 5 additions & 5 deletions network/fabric/2-org-1-peer/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "src/contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
Expand Down Expand Up @@ -31,8 +31,8 @@
"name": "Org1",
"mspid": "Org1MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org1.example.com"
],
Expand All @@ -44,8 +44,8 @@
"name": "Org2",
"mspid": "Org2MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org2.example.com"
],
Expand Down
20 changes: 10 additions & 10 deletions network/fabric/2-org-2-peer/composer-tls.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "src/contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
Expand All @@ -12,7 +12,7 @@
"url": "grpcs://localhost:7050",
"mspid": "OrdererMSP",
"mspconfig": "/etc/hyperledger/msp/orderer/tls/ca.crt",
"cert": "/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt",
"cert": "network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt",
"hostname": "orderer.example.com",
"hosturl": "orderer.example.com:7050"
}
Expand All @@ -32,8 +32,8 @@
"name": "Org1",
"mspid": "Org1MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org1.example.com"
],
Expand All @@ -46,8 +46,8 @@
"name": "Org2",
"mspid": "Org2MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org2.example.com"
],
Expand All @@ -62,7 +62,7 @@
"url": "grpcs://localhost:7051",
"eventUrl": "grpcs://localhost:7053",
"hostname": "peer0.org1.example.com",
"cert" : "/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -71,7 +71,7 @@
"url": "grpcs://localhost:7057",
"eventUrl": "grpcs://localhost:7059",
"hostname": "peer1.org1.example.com",
"cert" : "/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -80,7 +80,7 @@
"url": "grpcs://localhost:8051",
"eventUrl": "grpcs://localhost:8053",
"hostname": "peer0.org2.example.com",
"cert" : "/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -89,7 +89,7 @@
"url": "grpcs://localhost:8057",
"eventUrl": "grpcs://localhost:8059",
"hostname": "peer1.org2.example.com",
"cert" : "/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand Down
10 changes: 5 additions & 5 deletions network/fabric/2-org-2-peer/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "src/contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
Expand Down Expand Up @@ -31,8 +31,8 @@
"name": "Org1",
"mspid": "Org1MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org1.example.com"
],
Expand All @@ -45,8 +45,8 @@
"name": "Org2",
"mspid": "Org2MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org2.example.com"
],
Expand Down
24 changes: 12 additions & 12 deletions network/fabric/2-org-3-peer/composer-tls.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "src/contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
Expand All @@ -12,7 +12,7 @@
"url": "grpcs://localhost:7050",
"mspid": "OrdererMSP",
"mspconfig": "/etc/hyperledger/msp/orderer/tls/ca.crt",
"cert": "/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt",
"cert": "network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt",
"hostname": "orderer.example.com",
"hosturl": "orderer.example.com:7050"
}
Expand All @@ -32,8 +32,8 @@
"name": "Org1",
"mspid": "Org1MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org1.example.com"
],
Expand All @@ -47,8 +47,8 @@
"name": "Org2",
"mspid": "Org2MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org2.example.com"
],
Expand All @@ -64,7 +64,7 @@
"url": "grpcs://localhost:7051",
"eventUrl": "grpcs://localhost:7053",
"hostname": "peer0.org1.example.com",
"cert" : "/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -73,7 +73,7 @@
"url": "grpcs://localhost:7057",
"eventUrl": "grpcs://localhost:7059",
"hostname": "peer1.org1.example.com",
"cert" : "/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -82,7 +82,7 @@
"url": "grpcs://localhost:7063",
"eventUrl": "grpcs://localhost:7065",
"hostname": "peer2.org1.example.com",
"cert" : "/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -91,7 +91,7 @@
"url": "grpcs://localhost:8051",
"eventUrl": "grpcs://localhost:8053",
"hostname": "peer0.org2.example.com",
"cert" : "/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -100,7 +100,7 @@
"url": "grpcs://localhost:8057",
"eventUrl": "grpcs://localhost:8059",
"hostname": "peer1.org2.example.com",
"cert" : "/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand All @@ -109,7 +109,7 @@
"url": "grpcs://localhost:8063",
"eventUrl": "grpcs://localhost:8065",
"hostname": "peer2.org2.example.com",
"cert" : "/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/ca.crt",
"cert" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/ca.crt",
"channels":[
"mychannel"
]
Expand Down
10 changes: 5 additions & 5 deletions network/fabric/2-org-3-peer/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "src/contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
Expand Down Expand Up @@ -31,8 +31,8 @@
"name": "Org1",
"mspid": "Org1MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org1.example.com"
],
Expand All @@ -46,8 +46,8 @@
"name": "Org2",
"mspid": "Org2MSP",
"mspconfig": "/etc/hyperledger/msp/users/[email protected]/msp",
"adminCert": "/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"adminCert": "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]",
"adminKey" : "network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/key.pem",
"certificateAuthorities": [
"ca.org2.example.com"
],
Expand Down
Loading

0 comments on commit 6cb84f9

Please sign in to comment.