diff --git a/.gitignore b/.gitignore index e6b1c88892e..5ae26d39790 100755 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ report.xml .gradle build/ bin/ +examples/e2e_cli/channel-artifacts/*.tx +examples/e2e_cli/channel-artifacts/*.block +examples/e2e_cli/crypto-config/* diff --git a/examples/e2e_cli/base/docker-compose-base.yaml b/examples/e2e_cli/base/docker-compose-base.yaml new file mode 100644 index 00000000000..09b592a87f6 --- /dev/null +++ b/examples/e2e_cli/base/docker-compose-base.yaml @@ -0,0 +1,157 @@ +version: '2' + +services: + + orderer.example.com: + container_name: orderer.example.com + image: hyperledger/fabric-orderer + environment: + - ORDERER_GENERAL_LOGLEVEL=debug + - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 + - ORDERER_GENERAL_GENESISMETHOD=file + - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block + - ORDERER_GENERAL_LOCALMSPID=OrdererMSP + - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp + # enabled TLS + - ORDERER_GENERAL_TLS_ENABLED=true + - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key + - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt + - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] + working_dir: /opt/gopath/src/github.com/hyperledger/fabric + command: orderer + volumes: + - ../channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block + - ../crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp + - ../crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls + ports: + - 7050:7050 + +## To enable CouchDB as state database, uncomment the following sections of this file: +## 1) couchdb containers +## 2) peer environment variables CORE_LEDGER_STATE_STATEDATABASE and +## CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS +## 3) couch container names in "depends_on" section + +# couchdb0: +# container_name: couchdb0 +# image: hyperledger/fabric-couchdb +## Uncomment the port mapping if you want to expose the CouchDB service, +## for example to utilize Fauxton User Interface in dev environments. +# ports: +# - "5984:5984" + + peer0.org1.example.com: + container_name: peer0.org1.example.com + extends: + file: peer-base.yaml + service: peer-base + environment: + - CORE_PEER_ID=peer0.org1.example.com + - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 + - CORE_PEER_LOCALMSPID=Org1MSP + # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb0:5984 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp + - ../crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls + ports: + - 7051:7051 + - 7053:7053 + #depends_on: + # - couchdb0 + +# couchdb1: +# container_name: couchdb1 +# image: hyperledger/fabric-couchdb +## Uncomment the port mapping if you want to expose the CouchDB service, +## for example to utilize Fauxton User Interface in dev environments. +# ports: +# - "6984:5984" + + peer1.org1.example.com: + container_name: peer1.org1.example.com + extends: + file: peer-base.yaml + service: peer-base + environment: + - CORE_PEER_ID=peer1.org1.example.com + - CORE_PEER_ADDRESS=peer1.org1.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org1.example.com:7051 + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051 + - CORE_PEER_LOCALMSPID=Org1MSP + # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb1:5984 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp:/etc/hyperledger/fabric/msp + - ../crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls:/etc/hyperledger/fabric/tls + + ports: + - 8051:7051 + - 8053:7053 + #depends_on: + # - couchdb1 + +# couchdb2: +# container_name: couchdb2 +# image: hyperledger/fabric-couchdb +## Uncomment the port mapping if you want to expose the CouchDB service, +## for example to utilize Fauxton User Interface in dev environments. +# ports: +# - "7984:5984" + + peer0.org2.example.com: + container_name: peer0.org2.example.com + extends: + file: peer-base.yaml + service: peer-base + environment: + - CORE_PEER_ID=peer0.org2.example.com + - CORE_PEER_ADDRESS=peer0.org2.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:7051 + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:7051 + - CORE_PEER_LOCALMSPID=Org2MSP + # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb2:5984 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp:/etc/hyperledger/fabric/msp + - ../crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls:/etc/hyperledger/fabric/tls + ports: + - 9051:7051 + - 9053:7053 + #depends_on: + # - couchdb2 + +# couchdb3: +# container_name: couchdb3 +# image: hyperledger/fabric-couchdb +## Uncomment the port mapping if you want to expose the CouchDB service, +## for example to utilize Fauxton User Interface in dev environments. +# ports: +# - "8984:5984" + + peer1.org2.example.com: + container_name: peer1.org2.example.com + extends: + file: peer-base.yaml + service: peer-base + environment: + - CORE_PEER_ID=peer1.org2.example.com + - CORE_PEER_ADDRESS=peer1.org2.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org2.example.com:7051 + - CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org2.example.com:7051 + - CORE_PEER_LOCALMSPID=Org2MSP + # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb3:5984 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp:/etc/hyperledger/fabric/msp + - ../crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls:/etc/hyperledger/fabric/tls + ports: + - 10051:7051 + - 10053:7053 + #depends_on: + # - couchdb3 diff --git a/examples/e2e_cli/peer-base/peer-base.yaml b/examples/e2e_cli/base/peer-base.yaml similarity index 81% rename from examples/e2e_cli/peer-base/peer-base.yaml rename to examples/e2e_cli/base/peer-base.yaml index dc24f69b117..18fed0be946 100644 --- a/examples/e2e_cli/peer-base/peer-base.yaml +++ b/examples/e2e_cli/base/peer-base.yaml @@ -3,7 +3,6 @@ services: peer-base: image: hyperledger/fabric-peer environment: - #- CORE_PEER_ADDRESSAUTODETECT=true - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock # the following setting starts chaincode containers on the same # bridge network as the peers @@ -12,7 +11,6 @@ services: #- CORE_LOGGING_LEVEL=ERROR - CORE_LOGGING_LEVEL=DEBUG - CORE_PEER_TLS_ENABLED=true - - CORE_NEXT=true - CORE_PEER_ENDORSER_ENABLED=true - CORE_PEER_GOSSIP_USELEADERELECTION=true - CORE_PEER_GOSSIP_ORGLEADER=false @@ -20,5 +18,8 @@ services: # are not doing mutual TLS - CORE_PEER_GOSSIP_SKIPHANDSHAKE=true - CORE_PEER_PROFILE_ENABLED=true + - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt + - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key + - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer command: peer node start --peer-defaultchain=false diff --git a/examples/e2e_cli/channel-artifacts/.gitkeep b/examples/e2e_cli/channel-artifacts/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/examples/e2e_cli/configtx.yaml b/examples/e2e_cli/configtx.yaml index 3403f9de81b..85d0fe89378 100644 --- a/examples/e2e_cli/configtx.yaml +++ b/examples/e2e_cli/configtx.yaml @@ -17,15 +17,15 @@ Profiles: Consortiums: SampleConsortium: Organizations: - - *Org0 - *Org1 + - *Org2 TwoOrgsChannel: Consortium: SampleConsortium Application: <<: *ApplicationDefaults Organizations: - - *Org0 - *Org1 + - *Org2 ################################################################################ # @@ -48,12 +48,7 @@ Organizations: ID: OrdererMSP # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: crypto/orderer/localMspConfig - - # AdminPrincipal dictates the type of principal used for an organization's Admins policy - # Today, only the values of Role.ADMIN ad Role.MEMBER are accepted, which indicates a principal - # of role type ADMIN and role type MEMBER respectively - AdminPrincipal: Role.MEMBER + MSPDir: crypto-config/ordererOrganizations/example.com/msp # BCCSP (Blockchain crypto provider): Select which crypto implementation or # library to use @@ -67,20 +62,15 @@ Organizations: FileKeyStore: KeyStore: - - &Org0 + - &Org1 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment - Name: Org0MSP + Name: Org1MSP # ID to load the MSP definition as - ID: Org0MSP - - MSPDir: crypto/peer/peer0/localMspConfig + ID: Org1MSP - # AdminPrincipal dictates the type of principal used for an organization's Admins policy - # Today, only the values of Role.ADMIN ad Role.MEMBER are accepted, which indicates a principal - # of role type ADMIN and role type MEMBER respectively - AdminPrincipal: Role.MEMBER + MSPDir: crypto-config/peerOrganizations/org1.example.com/msp # BCCSP (Blockchain crypto provider): Select which crypto implementation or # library to use @@ -98,23 +88,18 @@ Organizations: # AnchorPeers defines the location of peers which can be used # for cross org gossip communication. Note, this value is only # encoded in the genesis block in the Application section context - - Host: peer0 + - Host: peer0.org1.example.com Port: 7051 - - &Org1 + - &Org2 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment - Name: Org1MSP + Name: Org2MSP # ID to load the MSP definition as - ID: Org1MSP - - MSPDir: crypto/peer/peer2/localMspConfig + ID: Org2MSP - # AdminPrincipal dictates the type of principal used for an organization's Admins policy - # Today, only the values of Role.ADMIN ad Role.MEMBER are accepted, which indicates a principal - # of role type ADMIN and role type MEMBER respectively - AdminPrincipal: Role.MEMBER + MSPDir: crypto-config/peerOrganizations/org2.example.com/msp # BCCSP (Blockchain crypto provider): Select which crypto implementation or # library to use @@ -132,7 +117,7 @@ Organizations: # AnchorPeers defines the location of peers which can be used # for cross org gossip communication. Note, this value is only # encoded in the genesis block in the Application section context - - Host: peer2 + - Host: peer0.org2.example.com Port: 7051 ################################################################################ @@ -150,7 +135,7 @@ Orderer: &OrdererDefaults OrdererType: solo Addresses: - - orderer0:7050 + - orderer.example.com:7050 # Batch Timeout: The amount of time to wait before creating a batch BatchTimeout: 2s diff --git a/examples/e2e_cli/crypto-config.yaml b/examples/e2e_cli/crypto-config.yaml new file mode 100644 index 00000000000..9c9c30bce95 --- /dev/null +++ b/examples/e2e_cli/crypto-config.yaml @@ -0,0 +1,76 @@ +# --------------------------------------------------------------------------- +# "OrdererOrgs" - Definition of organizations managing orderer nodes +# --------------------------------------------------------------------------- +OrdererOrgs: + # --------------------------------------------------------------------------- + # Orderer + # --------------------------------------------------------------------------- + - Name: Orderer + Domain: example.com + # --------------------------------------------------------------------------- + # "Specs" - See PeerOrgs below for complete description + # --------------------------------------------------------------------------- + Specs: + - Hostname: orderer +# --------------------------------------------------------------------------- +# "PeerOrgs" - Definition of organizations managing peer nodes +# --------------------------------------------------------------------------- +PeerOrgs: + # --------------------------------------------------------------------------- + # Org1 + # --------------------------------------------------------------------------- + - Name: Org1 + Domain: org1.example.com + # --------------------------------------------------------------------------- + # "Specs" + # --------------------------------------------------------------------------- + # Uncomment this section to enable the explicit definition of hosts in your + # configuration. Most users will want to use Template, below + # + # Specs is an array of Spec entries. Each Spec entry consists of two fields: + # - Hostname: (Required) The desired hostname, sans the domain. + # - CommonName: (Optional) Specifies the template or explicit override for + # the CN. By default, this is the template: + # + # "{{.Hostname}}.{{.Domain}}" + # + # which obtains its values from the Spec.Hostname and + # Org.Domain, respectively. + # --------------------------------------------------------------------------- + # Specs: + # - Hostname: foo # implicitly "foo.org1.example.com" + # CommonName: foo27.org5.example.com # overrides Hostname-based FQDN set above + # - Hostname: bar + # - Hostname: baz + # --------------------------------------------------------------------------- + # "Template" + # --------------------------------------------------------------------------- + # Allows for the definition of 1 or more hosts that are created sequentially + # from a template. By default, this looks like "peer%d" from 0 to Count-1. + # You may override the number of nodes (Count), the starting index (Start) + # or the template used to construct the name (Hostname). + # + # Note: Template and Specs are not mutually exclusive. You may define both + # sections and the aggregate nodes will be created for you. Take care with + # name collisions + # --------------------------------------------------------------------------- + Template: + Count: 2 + # Start: 5 + # Hostname: {{.Prefix}}{{.Index}} # default + # --------------------------------------------------------------------------- + # "Users" + # --------------------------------------------------------------------------- + # Count: The number of user accounts _in addition_ to Admin + # --------------------------------------------------------------------------- + Users: + Count: 1 + # --------------------------------------------------------------------------- + # Org2: See "Org1" for full specification + # --------------------------------------------------------------------------- + - Name: Org2 + Domain: org2.example.com + Template: + Count: 2 + Users: + Count: 1 diff --git a/examples/e2e_cli/crypto/orderer/localMspConfig/admincerts/ordererOrg0.pem b/examples/e2e_cli/crypto/orderer/localMspConfig/admincerts/ordererOrg0.pem deleted file mode 100644 index 604c9c35d42..00000000000 --- a/examples/e2e_cli/crypto/orderer/localMspConfig/admincerts/ordererOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBcjCCARigAwIBAwICA+gwCgYIKoZIzj0EAwIwFjEUMBIGA1UEAwwLb3JkZXJl -ck9yZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjAWMRQwEgYDVQQD -DAtvcmRlcmVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK8Sv0EA9h06 -fmBkUCO+D/b/2INZ2huy+W/HCxSF22c7WGoJbRzQcWtQmW1KqZowUk86RcxVfFqv -jEMFVXzV38SjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFCVakuvq -xEcK8pYMf/Hw8hsexRMTMB8GA1UdIwQYMBaAFCVakuvqxEcK8pYMf/Hw8hsexRMT -MAoGCCqGSM49BAMCA0gAMEUCIQCmXgDSRTyxpSk+PXg0FNlYZ4ijTVwKgLkYVhod -zZPfngIgO4y0p3Fs/gNsJYrroKaaVDe955KrPp/O55jYDKAD/oY= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem b/examples/e2e_cli/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem deleted file mode 100644 index 604c9c35d42..00000000000 --- a/examples/e2e_cli/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBcjCCARigAwIBAwICA+gwCgYIKoZIzj0EAwIwFjEUMBIGA1UEAwwLb3JkZXJl -ck9yZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjAWMRQwEgYDVQQD -DAtvcmRlcmVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK8Sv0EA9h06 -fmBkUCO+D/b/2INZ2huy+W/HCxSF22c7WGoJbRzQcWtQmW1KqZowUk86RcxVfFqv -jEMFVXzV38SjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFCVakuvq -xEcK8pYMf/Hw8hsexRMTMB8GA1UdIwQYMBaAFCVakuvqxEcK8pYMf/Hw8hsexRMT -MAoGCCqGSM49BAMCA0gAMEUCIQCmXgDSRTyxpSk+PXg0FNlYZ4ijTVwKgLkYVhod -zZPfngIgO4y0p3Fs/gNsJYrroKaaVDe955KrPp/O55jYDKAD/oY= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/orderer/localMspConfig/keystore/ordererSigner.pem b/examples/e2e_cli/crypto/orderer/localMspConfig/keystore/ordererSigner.pem deleted file mode 100644 index e3d29310bf4..00000000000 --- a/examples/e2e_cli/crypto/orderer/localMspConfig/keystore/ordererSigner.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIJPtBtNKlilpgVZ5FGUBWB2KH3zBtzkBnkrFMmi6W/80oAoGCCqGSM49 -AwEHoUQDQgAEfWHpZ4VacEOA83luJdvLOpKEasBn3O067iPTfFyupQh6cFABIn+u -YASuariSKU3JFWfB1nANwZOsDA9B8BeRUA== ------END EC PRIVATE KEY----- diff --git a/examples/e2e_cli/crypto/orderer/localMspConfig/signcerts/orderer0Signer.pem b/examples/e2e_cli/crypto/orderer/localMspConfig/signcerts/orderer0Signer.pem deleted file mode 100644 index 171bc88a110..00000000000 --- a/examples/e2e_cli/crypto/orderer/localMspConfig/signcerts/orderer0Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBajCCAQ+gAwIBAwICA+gwCgYIKoZIzj0EAwIwFjEUMBIGA1UEAwwLb3JkZXJl -ck9yZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQD -DAhvcmRlcmVyMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH1h6WeFWnBDgPN5 -biXbyzqShGrAZ9ztOu4j03xcrqUIenBQASJ/rmAErmq4kilNyRVnwdZwDcGTrAwP -QfAXkVCjUDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFK01/Qm7YoTpXLXjq18D -+X2pExanMB8GA1UdIwQYMBaAFCVakuvqxEcK8pYMf/Hw8hsexRMTMAoGCCqGSM49 -BAMCA0kAMEYCIQDXdRYqrZdTAM6F2JBl/eN3nIHoBa7N3gIQDqdUAris8wIhAP6i -f0CgyBN4nWmw2mT+XtxaB0xxWrhYj/j4agiuQzrd ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peer0Signer.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peer0Signer.pem deleted file mode 100644 index 52b6db4aef0..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peer0Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEF6dfqjqfbIgZuOR+dgoJMl -/FaUlGI70A/ixmVUY83Yp4YtV3FDBSOPiO5O+s8pHnpbwB1LqhrxAx1Plr0M/UWj -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBY2bc84vLEwkX1fSAER2p48jJXw -MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqGSM49BAMCA0gA -MEUCIQDeDZ71L+OTYcbbqiDNRf0L8OExO59mH1O3xpdwMAM0MgIgXySG4sv9yV31 -WcWRFfRFyu7o3T72kqiLZ1nkDuJ8jWI= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/admincerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/cacerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/keystore/peer0Signer.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/keystore/peer0Signer.pem deleted file mode 100644 index 811fd382dd8..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/keystore/peer0Signer.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIKyhczWGQa7NbV1tq9LkZkvqslzoQ1HaEVwA6FCLOfvioAoGCCqGSM49 -AwEHoUQDQgAEQXp1+qOp9siBm45H52CgkyX8VpSUYjvQD+LGZVRjzdinhi1XcUMF -I4+I7k76zykeelvAHUuqGvEDHU+WvQz9RQ== ------END EC PRIVATE KEY----- diff --git a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/signcerts/peer0Signer.pem b/examples/e2e_cli/crypto/peer/peer0/localMspConfig/signcerts/peer0Signer.pem deleted file mode 100644 index 52b6db4aef0..00000000000 --- a/examples/e2e_cli/crypto/peer/peer0/localMspConfig/signcerts/peer0Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEF6dfqjqfbIgZuOR+dgoJMl -/FaUlGI70A/ixmVUY83Yp4YtV3FDBSOPiO5O+s8pHnpbwB1LqhrxAx1Plr0M/UWj -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBY2bc84vLEwkX1fSAER2p48jJXw -MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqGSM49BAMCA0gA -MEUCIQDeDZ71L+OTYcbbqiDNRf0L8OExO59mH1O3xpdwMAM0MgIgXySG4sv9yV31 -WcWRFfRFyu7o3T72kqiLZ1nkDuJ8jWI= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peer1Signer.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peer1Signer.pem deleted file mode 100644 index 3040662bf74..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peer1Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABI9/7z3nMORUeS3rZ+F93ymD -R2jiB6Wm+QSoSz/uQuRavnoksgU6peF5rBMfebk/PfNoVjdR4egCqAHBHIpp7Iuj -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFJpxVAXpMAEOHtbNCwvL1m/ku9gt -MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqGSM49BAMCA0gA -MEUCIQDsQ6lmuLdKmMgnN5+9YjlpCRQEJCoaG3uxRHhrAecZngIgQZlwnvwka+TM -gF/yC3r2MeELK9ocw8c22DAe6x71RT4= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/admincerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/cacerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/keystore/peer1Signer.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/keystore/peer1Signer.pem deleted file mode 100644 index ed6814c8eb7..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/keystore/peer1Signer.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIGke7eS6obPUxqqTr3k4svyI+7H2K8vtauJslox/rNjooAoGCCqGSM49 -AwEHoUQDQgAEj3/vPecw5FR5Letn4X3fKYNHaOIHpab5BKhLP+5C5Fq+eiSyBTql -4XmsEx95uT8982hWN1Hh6AKoAcEcimnsiw== ------END EC PRIVATE KEY----- diff --git a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/signcerts/peer1Signer.pem b/examples/e2e_cli/crypto/peer/peer1/localMspConfig/signcerts/peer1Signer.pem deleted file mode 100644 index 3040662bf74..00000000000 --- a/examples/e2e_cli/crypto/peer/peer1/localMspConfig/signcerts/peer1Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABI9/7z3nMORUeS3rZ+F93ymD -R2jiB6Wm+QSoSz/uQuRavnoksgU6peF5rBMfebk/PfNoVjdR4egCqAHBHIpp7Iuj -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFJpxVAXpMAEOHtbNCwvL1m/ku9gt -MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqGSM49BAMCA0gA -MEUCIQDsQ6lmuLdKmMgnN5+9YjlpCRQEJCoaG3uxRHhrAecZngIgQZlwnvwka+TM -gF/yC3r2MeELK9ocw8c22DAe6x71RT4= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peer2Signer.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peer2Signer.pem deleted file mode 100644 index e6c7ec260fb..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peer2Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLZyoiEc/0aTctk8THKHtQ8W -F2BAG1vgB6kxT+cUaLnEH2El9NTvRYjHmjq8ozM9+/R2JVucEGZelAIQxKD5pXuj -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFDdoFJ6jiClMPOVsNx5akist91so -MB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqGSM49BAMCA0gA -MEUCIQC7wATZy+O/7UIPzSiMSXNgBKCaT2U55+Y/e0FcHQFSoQIgCyKExrm3gtW0 -SAN1VofiAZkr3gYndu9goHZe4wVh9eQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/admincerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/cacerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/keystore/peer2Signer.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/keystore/peer2Signer.pem deleted file mode 100644 index 56fe97734b2..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/keystore/peer2Signer.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEICO7+w9YD/MdNiZHXusiWGhHTOOAXks10aJGuITmZ0wkoAoGCCqGSM49 -AwEHoUQDQgAEtnKiIRz/RpNy2TxMcoe1DxYXYEAbW+AHqTFP5xRoucQfYSX01O9F -iMeaOryjMz379HYlW5wQZl6UAhDEoPmlew== ------END EC PRIVATE KEY----- diff --git a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/signcerts/peer2Signer.pem b/examples/e2e_cli/crypto/peer/peer2/localMspConfig/signcerts/peer2Signer.pem deleted file mode 100644 index e6c7ec260fb..00000000000 --- a/examples/e2e_cli/crypto/peer/peer2/localMspConfig/signcerts/peer2Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLZyoiEc/0aTctk8THKHtQ8W -F2BAG1vgB6kxT+cUaLnEH2El9NTvRYjHmjq8ozM9+/R2JVucEGZelAIQxKD5pXuj -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFDdoFJ6jiClMPOVsNx5akist91so -MB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqGSM49BAMCA0gA -MEUCIQC7wATZy+O/7UIPzSiMSXNgBKCaT2U55+Y/e0FcHQFSoQIgCyKExrm3gtW0 -SAN1VofiAZkr3gYndu9goHZe4wVh9eQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peer3Signer.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peer3Signer.pem deleted file mode 100644 index 275533ba95e..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peer3Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMvgApKCXYIEY4YgPTgQKrLM -GMdK/1j8WEl2hijED+onVUF/w/oleiSljNOCxdda3u3X0yXqXz/ozQPJL/d4YL+j -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFOzMeVZK5xYzjaeO2uGvz8B7CQS7 -MB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqGSM49BAMCA0gA -MEUCIQCgKtFodSdXcz2yf9MZB90t1nXYytpGUPMAl0/Gy2/yfQIgAcC1KRtaiclr -9C9tshhXdYdbpvDruVZrwqjJ4drPHik= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/admincerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg0.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg0.pem deleted file mode 100644 index ac4f5af8d4b..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg0.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg1.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg1.pem deleted file mode 100644 index d02884fa177..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg1.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg2.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg2.pem deleted file mode 100644 index 813cbe94ec9..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/cacerts/peerOrg2.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzIwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjATMREwDwYDVQQDDAhw -ZWVyT3JnMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH3IweQK1AJdcV3FF27a -gNKhy13Nz2OguzsmUbW85/7pReenAWzs89rEApHXoJqUtNzdZfaLkcq32E1Ilk3N -oN2jVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFEhOilIyGA53r9Zo -O5GQP0RSZcQ1MB8GA1UdIwQYMBaAFEhOilIyGA53r9ZoO5GQP0RSZcQ1MAoGCCqG -SM49BAMCA0gAMEUCIQD+/5z68ewJarixMgYrg/MwyTMwX7ikCaCgU5TN2MU1PQIg -Qe+klrq6COxsmrctClV64Wj4zhGTOhaZG1yN24OXukQ= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/keystore/peer3Signer.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/keystore/peer3Signer.pem deleted file mode 100644 index 73e45690181..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/keystore/peer3Signer.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIPK7O2ZBw9tXDiVd2OM+riCIHT+uQPynGd0z9fjLSUltoAoGCCqGSM49 -AwEHoUQDQgAEy+ACkoJdggRjhiA9OBAqsswYx0r/WPxYSXaGKMQP6idVQX/D+iV6 -JKWM04LF11re7dfTJepfP+jNA8kv93hgvw== ------END EC PRIVATE KEY----- diff --git a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/signcerts/peer3Signer.pem b/examples/e2e_cli/crypto/peer/peer3/localMspConfig/signcerts/peer3Signer.pem deleted file mode 100644 index 275533ba95e..00000000000 --- a/examples/e2e_cli/crypto/peer/peer3/localMspConfig/signcerts/peer3Signer.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBYzCCAQmgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjExWhcNMTgwMjIwMTkwNjExWjAQMQ4wDAYDVQQDDAVw -ZWVyMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMvgApKCXYIEY4YgPTgQKrLM -GMdK/1j8WEl2hijED+onVUF/w/oleiSljNOCxdda3u3X0yXqXz/ozQPJL/d4YL+j -UDBOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFOzMeVZK5xYzjaeO2uGvz8B7CQS7 -MB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqGSM49BAMCA0gA -MEUCIQCgKtFodSdXcz2yf9MZB90t1nXYytpGUPMAl0/Gy2/yfQIgAcC1KRtaiclr -9C9tshhXdYdbpvDruVZrwqjJ4drPHik= ------END CERTIFICATE----- diff --git a/examples/e2e_cli/docker-compose-cli.yaml b/examples/e2e_cli/docker-compose-cli.yaml new file mode 100644 index 00000000000..aca64f51323 --- /dev/null +++ b/examples/e2e_cli/docker-compose-cli.yaml @@ -0,0 +1,64 @@ +version: '2' + +services: + + orderer.example.com: + extends: + file: base/docker-compose-base.yaml + service: orderer.example.com + container_name: orderer.example.com + + peer0.org1.example.com: + container_name: peer0.org1.example.com + extends: + file: base/docker-compose-base.yaml + service: peer0.org1.example.com + + peer1.org1.example.com: + container_name: peer1.org1.example.com + extends: + file: base/docker-compose-base.yaml + service: peer1.org1.example.com + + peer0.org2.example.com: + container_name: peer0.org2.example.com + extends: + file: base/docker-compose-base.yaml + service: peer0.org2.example.com + + peer1.org2.example.com: + container_name: peer1.org2.example.com + extends: + file: base/docker-compose-base.yaml + service: peer1.org2.example.com + + cli: + container_name: cli + image: hyperledger/fabric-testenv + tty: true + environment: + - GOPATH=/opt/gopath + - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock + - CORE_LOGGING_LEVEL=DEBUG + - CORE_PEER_ID=cli + - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 + - CORE_PEER_LOCALMSPID=Org1MSP + - CORE_PEER_TLS_ENABLED=true + - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt + - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key + - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt + - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp + working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer + command: /bin/bash -c './scripts/script.sh ${CHANNEL_NAME}; sleep $TIMEOUT' + volumes: + - /var/run/:/host/var/run/ + - ./examples:/opt/gopath/src/github.com/hyperledger/fabric/examples + - ./crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ + - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ + - ./channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts + depends_on: + - orderer.example.com + - peer0.org1.example.com + - peer1.org1.example.com + - peer0.org2.example.com + - peer1.org2.example.com diff --git a/examples/e2e_cli/docker-compose-e2e-template.yaml b/examples/e2e_cli/docker-compose-e2e-template.yaml new file mode 100644 index 00000000000..70b7cc8d8a0 --- /dev/null +++ b/examples/e2e_cli/docker-compose-e2e-template.yaml @@ -0,0 +1,62 @@ +version: '2' + +services: + ca0: + image: hyperledger/fabric-ca + environment: + - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server + - FABRIC_CA_SERVER_CA_NAME=ca-org1 + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/CA1_PRIVATE_KEY + ports: + - "7054:7054" + command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/CA1_PRIVATE_KEY -b admin:adminpw -d' + volumes: + - ./crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + container_name: ca_peerOrg1 + + ca1: + image: hyperledger/fabric-ca + environment: + - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server + - FABRIC_CA_SERVER_CA_NAME=ca-org2 + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/CA2_PRIVATE_KEY + ports: + - "8054:7054" + command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/CA2_PRIVATE_KEY -b admin:adminpw -d' + volumes: + - ./crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + container_name: ca_peerOrg2 + + orderer.example.com: + extends: + file: base/docker-compose-base.yaml + service: orderer.example.com + container_name: orderer.example.com + + peer0.org1.example.com: + container_name: peer0.org1.example.com + extends: + file: base/docker-compose-base.yaml + service: peer0.org1.example.com + + peer1.org1.example.com: + container_name: peer1.org1.example.com + extends: + file: base/docker-compose-base.yaml + service: peer1.org1.example.com + + peer0.org2.example.com: + container_name: peer0.org2.example.com + extends: + file: base/docker-compose-base.yaml + service: peer0.org2.example.com + + peer1.org2.example.com: + container_name: peer1.org2.example.com + extends: + file: base/docker-compose-base.yaml + service: peer1.org2.example.com diff --git a/examples/e2e_cli/docker-compose-e2e.yaml b/examples/e2e_cli/docker-compose-e2e.yaml new file mode 100644 index 00000000000..a3d9ac4df1a --- /dev/null +++ b/examples/e2e_cli/docker-compose-e2e.yaml @@ -0,0 +1,62 @@ +version: '2' + +services: + ca0: + image: hyperledger/fabric-ca + environment: + - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server + - FABRIC_CA_SERVER_CA_NAME=ca-org1 + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/2628c774d6def25e2bf6147c30f25fe76469d63d257965ac867544acd090148c_sk + ports: + - "7054:7054" + command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/2628c774d6def25e2bf6147c30f25fe76469d63d257965ac867544acd090148c_sk -b admin:adminpw -d' + volumes: + - ./crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + container_name: ca_peerOrg1 + + ca1: + image: hyperledger/fabric-ca + environment: + - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server + - FABRIC_CA_SERVER_CA_NAME=ca-org2 + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/3f39c678fc9b1f79cddb94f1e896cc3c487aa25c2ebf8b7f3e0205c2d21a37ec_sk + ports: + - "8054:7054" + command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/3f39c678fc9b1f79cddb94f1e896cc3c487aa25c2ebf8b7f3e0205c2d21a37ec_sk -b admin:adminpw -d' + volumes: + - ./crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + container_name: ca_peerOrg2 + + orderer.example.com: + extends: + file: base/docker-compose-base.yaml + service: orderer.example.com + container_name: orderer.example.com + + peer0.org1.example.com: + container_name: peer0.org1.example.com + extends: + file: base/docker-compose-base.yaml + service: peer0.org1.example.com + + peer1.org1.example.com: + container_name: peer1.org1.example.com + extends: + file: base/docker-compose-base.yaml + service: peer1.org1.example.com + + peer0.org2.example.com: + container_name: peer0.org2.example.com + extends: + file: base/docker-compose-base.yaml + service: peer0.org2.example.com + + peer1.org2.example.com: + container_name: peer1.org2.example.com + extends: + file: base/docker-compose-base.yaml + service: peer1.org2.example.com diff --git a/examples/e2e_cli/docker-compose-no-tls.yaml b/examples/e2e_cli/docker-compose-no-tls.yaml deleted file mode 100644 index e4ca46db1c6..00000000000 --- a/examples/e2e_cli/docker-compose-no-tls.yaml +++ /dev/null @@ -1,126 +0,0 @@ -version: '2' - -services: - - orderer0: - container_name: orderer0 - image: hyperledger/fabric-orderer - environment: - - ORDERER_GENERAL_LOGLEVEL=debug - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.block - - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/localMspConfig - working_dir: /opt/gopath/src/github.com/hyperledger/fabric - command: orderer - volumes: - - ./crypto/orderer:/var/hyperledger/orderer - ports: - - 7050:7050 - - peer0: - container_name: peer0 - extends: - file: peer-base/peer-base-no-tls.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer0 - - CORE_PEER_LOCALMSPID=Org0MSP - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer0/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 7051:7051 - - 7053:7053 - depends_on: - - orderer0 - - peer1: - container_name: peer1 - extends: - file: peer-base/peer-base-no-tls.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer1 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer0:7051 - - CORE_PEER_LOCALMSPID=Org0MSP - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer1/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 8051:7051 - - 8053:7053 - depends_on: - - orderer0 - - peer0 - - peer2: - container_name: peer2 - extends: - file: peer-base/peer-base-no-tls.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer2 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer2/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 9051:7051 - - 9053:7053 - depends_on: - - orderer0 - - peer0 - - peer1 - - peer3: - container_name: peer3 - extends: - file: peer-base/peer-base-no-tls.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer3 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer3/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 10051:7051 - - 10053:7053 - depends_on: - - orderer0 - - peer0 - - peer1 - - peer2 - - cli: - container_name: cli - image: hyperledger/fabric-testenv - tty: true - environment: - - GOPATH=/opt/gopath - - CORE_PEER_ADDRESSAUTODETECT=true - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_LOGGING_LEVEL=DEBUG - - CORE_NEXT=true - - CORE_PEER_ID=cli - - CORE_PEER_ENDORSER_ENABLED=true - - CORE_PEER_ADDRESS=peer0:7051 - - CORE_PEER_GOSSIP_IGNORESECURITY=true - - CORE_PEER_LOCALMSPID=Org0MSP - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer - command: /bin/bash -c './scripts/script.sh ${CHANNEL_NAME}; ' - volumes: - - /var/run/:/host/var/run/ - - ./examples/:/opt/gopath/src/github.com/hyperledger/fabric/examples/ - - ./crypto:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - depends_on: - - orderer0 - - peer0 - - peer1 - - peer2 - - peer3 diff --git a/examples/e2e_cli/docker-compose.yaml b/examples/e2e_cli/docker-compose.yaml deleted file mode 100644 index 3bf8c0c417e..00000000000 --- a/examples/e2e_cli/docker-compose.yaml +++ /dev/null @@ -1,212 +0,0 @@ -version: '2' - -services: - - orderer0: - container_name: orderer0 - image: hyperledger/fabric-orderer - environment: - - ORDERER_GENERAL_LOGLEVEL=debug - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.block - - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/localMspConfig - # enabled TLS - - ORDERER_GENERAL_TLS_ENABLED=true - - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/localMspConfig/keystore/ordererSigner.pem - - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/localMspConfig/signcerts/orderer0Signer.pem - - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/localMspConfig/cacerts/ordererOrg0.pem] - working_dir: /opt/gopath/src/github.com/hyperledger/fabric - command: orderer - volumes: - - ./crypto/orderer:/var/hyperledger/orderer - ports: - - 7050:7050 - -## To enable CouchDB as state database, uncomment the following sections of this file: -## 1) couchdb containers -## 2) peer environment variables CORE_LEDGER_STATE_STATEDATABASE and -## CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS -## 3) couch container names in "depends_on" section - -# couchdb0: -# container_name: couchdb0 -# image: hyperledger/fabric-couchdb -## Uncomment the port mapping if you want to expose the CouchDB service, -## for example to utilize Fauxton User Interface in dev environments. -# ports: -# - "5984:5984" - - peer0: - container_name: peer0 - extends: - file: peer-base/peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer0 - - CORE_PEER_ADDRESS=peer0:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0:7051 - - CORE_PEER_LOCALMSPID=Org0MSP - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/msp/signcerts/peer0Signer.pem - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/msp/keystore/peer0Signer.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/msp/cacerts/peerOrg0.pem - # - CORE_PEER_TLS_SERVERHOSTOVERRIDE=peer0 - # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb0:5984 - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer0/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 7051:7051 - - 7053:7053 - depends_on: - - orderer0 - # - couchdb0 - -# couchdb1: -# container_name: couchdb1 -# image: hyperledger/fabric-couchdb -## Uncomment the port mapping if you want to expose the CouchDB service, -## for example to utilize Fauxton User Interface in dev environments. -# ports: -# - "6984:5984" - - peer1: - container_name: peer1 - extends: - file: peer-base/peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer1 - - CORE_PEER_ADDRESS=peer1:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1:7051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer0:7051 - - CORE_PEER_LOCALMSPID=Org0MSP - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/msp/signcerts/peer1Signer.pem - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/msp/keystore/peer1Signer.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/msp/cacerts/peerOrg0.pem - # - CORE_PEER_TLS_SERVERHOSTOVERRIDE=peer1 - # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb1:5984 - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer1/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 8051:7051 - - 8053:7053 - depends_on: - - orderer0 - - peer0 - # - couchdb1 - -# couchdb2: -# container_name: couchdb2 -# image: hyperledger/fabric-couchdb -## Uncomment the port mapping if you want to expose the CouchDB service, -## for example to utilize Fauxton User Interface in dev environments. -# ports: -# - "7984:5984" - - peer2: - container_name: peer2 - extends: - file: peer-base/peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer2 - - CORE_PEER_ADDRESS=peer2:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer2:7051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/msp/signcerts/peer2Signer.pem - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/msp/keystore/peer2Signer.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/msp/admincerts/peerOrg1.pem - #- CORE_PEER_TLS_SERVERHOSTOVERRIDE=peer2 - # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb2:5984 - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer2/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 9051:7051 - - 9053:7053 - depends_on: - - orderer0 - - peer0 - - peer1 - # - couchdb2 - -# couchdb3: -# container_name: couchdb3 -# image: hyperledger/fabric-couchdb -## Uncomment the port mapping if you want to expose the CouchDB service, -## for example to utilize Fauxton User Interface in dev environments. -# ports: -# - "8984:5984" - - peer3: - container_name: peer3 - extends: - file: peer-base/peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer3 - - CORE_PEER_ADDRESS=peer3:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer3:7051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/msp/signcerts/peer3Signer.pem - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/msp/keystore/peer3Signer.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/msp/cacerts/peerOrg1.pem - # - CORE_PEER_TLS_SERVERHOSTOVERRIDE=peer3 - # - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - # - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb3:5984 - volumes: - - /var/run/:/host/var/run/ - - ./crypto/peer/peer3/localMspConfig:/etc/hyperledger/fabric/msp - ports: - - 10051:7051 - - 10053:7053 - depends_on: - - orderer0 - - peer0 - - peer1 - - peer2 - # - couchdb3 - - cli: - container_name: cli - image: hyperledger/fabric-testenv - tty: true - environment: - - CORE_PEER_ADDRESSAUTODETECT=true - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_LOGGING_LEVEL=DEBUG - - CORE_NEXT=true - - CORE_PEER_ID=cli - - CORE_PEER_ENDORSER_ENABLED=true - - CORE_PEER_ADDRESS=peer0:7051 - - CORE_PEER_LOCALMSPID=Org0MSP - - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig/signcerts/peer0Signer.pem - - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig/keystore/peer0Signer.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig/cacerts/peerOrg0.pem - # - CORE_PEER_TLS_SERVERHOSTOVERRIDE=peer0 - - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig - - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer - command: /bin/bash -c './scripts/script.sh ${CHANNEL_NAME}; ' - #command: /bin/bash - volumes: - - /var/run/:/host/var/run/ - - ./examples/:/opt/gopath/src/github.com/hyperledger/fabric/examples/ - - ../chaincode/go/:/opt/gopath/src/github.com/hyperledger/fabric/examples/chaincode/go - - ./crypto:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - depends_on: - - orderer0 - - peer0 - - peer1 - - peer2 - - peer3 diff --git a/examples/e2e_cli/end-to-end.rst b/examples/e2e_cli/end-to-end.rst index 8ae5dc77610..746261c5625 100644 --- a/examples/e2e_cli/end-to-end.rst +++ b/examples/e2e_cli/end-to-end.rst @@ -205,8 +205,8 @@ What's happening behind the scenes? - Now we have a channel consisting of four peers, and two organizations. -- ``PEER0`` and ``PEER1`` belong to Org0; ``PEER2`` and ``PEER3`` - belong to Org1 +- ``PEER0`` and ``PEER1`` belong to Org1; ``PEER2`` and ``PEER3`` + belong to Org2 - Recall that these relationships are defined in the ``configtx.yaml`` @@ -221,8 +221,8 @@ What's happening behind the scenes? - The instantiation also passes in an argument for the endorsement policy. The policy is defined as - ``-P "OR ('Org0MSP.member','Org1MSP.member')"``, meaning that any - transaction must be endorsed by a peer tied to Org0 or Org1. + ``-P "OR ('Org1MSP.member','Org2MSP.member')"``, meaning that any + transaction must be endorsed by a peer tied to Org1 or Org2. - A query against the value of "a" is issued to ``PEER0``. The chaincode was previously installed on ``PEER0``, so this will start @@ -379,7 +379,7 @@ orderer. # Environment variables for PEER0 CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig CORE_PEER_ADDRESS=peer0:7051 - CORE_PEER_LOCALMSPID="Org0MSP" + CORE_PEER_LOCALMSPID="Org1MSP" CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig/cacerts/peerOrg0.pem These environment variables for each peer are defined in the supplied @@ -453,12 +453,12 @@ Instantiate chaincode and define the endorsement policy Instantiate the chaincode on a peer. This will launch a chaincode container for the targeted peer and set the endorsement policy for the chaincode. In this snippet, we define the policy as requiring an -endorsement from one peer node that is a part of either `Org0` or `Org1`. +endorsement from one peer node that is a part of either `Org1` or `Org2`. The command is: .. code:: bash - peer chaincode instantiate -o orderer0:7050 --tls $CORE_PEER_TLS_ENABLED --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem -C mychannel -n mycc -v 1.0 -p github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 -c '{"Args":["init","a", "100", "b","200"]}' -P "OR ('Org0MSP.member','Org1MSP.member')" + peer chaincode instantiate -o orderer0:7050 --tls $CORE_PEER_TLS_ENABLED --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem -C mychannel -n mycc -v 1.0 -p github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 -c '{"Args":["init","a", "100", "b","200"]}' -P "OR ('Org1MSP.member','Org2MSP.member')" See the `endorsement policies `__ @@ -702,7 +702,7 @@ chaincode: .. code:: bash peer chaincode install -o orderer0:7050 -n marbles -v 1.0 -p github.com/hyperledger/fabric/examples/chaincode/go/marbles02 - peer chaincode instantiate -o orderer0:7050 --tls $CORE_PEER_TLS_ENABLED --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem -C mychannel -n marbles -v 1.0 -p github.com/hyperledger/fabric/examples/chaincode/go/marbles02 -c '{"Args":["init"]}' -P "OR ('Org0MSP.member','Org1MSP.member')" + peer chaincode instantiate -o orderer0:7050 --tls $CORE_PEER_TLS_ENABLED --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem -C mychannel -n marbles -v 1.0 -p github.com/hyperledger/fabric/examples/chaincode/go/marbles02 -c '{"Args":["init"]}' -P "OR ('Org1MSP.member','Org2MSP.member')" - Create some marbles and move them around: diff --git a/examples/e2e_cli/generateArtifacts.sh b/examples/e2e_cli/generateArtifacts.sh new file mode 100755 index 00000000000..281cca467b9 --- /dev/null +++ b/examples/e2e_cli/generateArtifacts.sh @@ -0,0 +1,95 @@ +#!/bin/bash +x + +#set -e + +: ${CHANNEL_NAME:="mychannel"} +CHANNEL_NAME=$1 +echo $CHANNEL_NAME + +export FABRIC_ROOT=$PWD/../.. +export FABRIC_CFG_PATH=$PWD +echo + +OS_ARCH=$(echo "$(uname -s)-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}') + +## Using docker-compose template replace private key file names with constants +function replacePrivateKey () { + ARCH=`uname -s | grep Darwin` + if [ "$ARCH" == "Darwin" ]; then + OPTS="-it" + else + OPTS="-i" + fi + + cp docker-compose-e2e-template.yaml docker-compose-e2e.yaml + + CURRENT_DIR=$PWD + cd crypto-config/peerOrganizations/org1.example.com/ca/ + PRIV_KEY=$(ls *_sk) + cd $CURRENT_DIR + sed $OPTS "s/CA1_PRIVATE_KEY/${PRIV_KEY}/g" docker-compose-e2e.yaml + cd crypto-config/peerOrganizations/org2.example.com/ca/ + PRIV_KEY=$(ls *_sk) + cd $CURRENT_DIR + sed $OPTS "s/CA2_PRIVATE_KEY/${PRIV_KEY}/g" docker-compose-e2e.yaml +} + +## Generates Org certs using cryptogen tool +function generateCerts (){ + CRYPTOGEN=$FABRIC_ROOT/release/$OS_ARCH/bin/cryptogen + + if [ -f "$CRYPTOGEN" ]; then + echo "Using cryptogen -> $CRYPTOGEN" + else + echo "Building cryptogen" + make -C $FABRIC_ROOT release-all + fi + + echo + echo "##########################################################" + echo "##### Generate certificates using cryptogen tool #########" + echo "##########################################################" + $CRYPTOGEN generate --config=./crypto-config.yaml + echo +} + +## Generate orderer genesis block , channel configuration transaction and anchor peer update transactions +function generateChannelArtifacts() { + + CONFIGTXGEN=$FABRIC_ROOT/release/$OS_ARCH/bin/configtxgen + if [ -f "$CONFIGTXGEN" ]; then + echo "Using configtxgen -> $CONFIGTXGEN" + else + echo "Building configtxgen" + make -C $FABRIC_ROOT release-all + fi + + echo "##########################################################" + echo "######### Generating Orderer Genesis block ##############" + echo "##########################################################" + $CONFIGTXGEN -profile TwoOrgsOrdererGenesis -outputBlock ./channel-artifacts/orderer.genesis.block + + echo + echo "#################################################################" + echo "### Generating channel configuration transaction 'channel.tx' ###" + echo "#################################################################" + $CONFIGTXGEN -profile TwoOrgsChannel -outputCreateChannelTx ./channel-artifacts/channel.tx -channelID $CHANNEL_NAME + + echo + echo "#################################################################" + echo "####### Generating anchor peer update for Org1MSP ##########" + echo "#################################################################" + $CONFIGTXGEN -profile TwoOrgsChannel -outputAnchorPeersUpdate ./channel-artifacts/Org1MSPanchors.tx -channelID $CHANNEL_NAME -asOrg Org1MSP + + echo + echo "#################################################################" + echo "####### Generating anchor peer update for Org2MSP ##########" + echo "#################################################################" + $CONFIGTXGEN -profile TwoOrgsChannel -outputAnchorPeersUpdate ./channel-artifacts/Org2MSPanchors.tx -channelID $CHANNEL_NAME -asOrg Org2MSP + echo +} + +generateCerts +replacePrivateKey +generateChannelArtifacts + diff --git a/examples/e2e_cli/generateCfgTrx.sh b/examples/e2e_cli/generateCfgTrx.sh deleted file mode 100755 index 0a6b33452d5..00000000000 --- a/examples/e2e_cli/generateCfgTrx.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -e - -CHANNEL_NAME=$1 -if [ -z "$1" ]; then - echo "Setting channel to default name 'mychannel'" - CHANNEL_NAME="mychannel" -fi - -export FABRIC_ROOT=$PWD/../.. -export FABRIC_CFG_PATH=$PWD - -echo "Channel name - "$CHANNEL_NAME -echo - -CONFIGTXGEN=`which configtxgen || /bin/true` - -if [ "$CONFIGTXGEN" == "" ]; then - echo "Building configtxgen" - make -C $FABRIC_ROOT configtxgen - CONFIGTXGEN=$FABRIC_ROOT/build/bin/configtxgen -else - echo "Using configtxgen -> $CONFIGTXGEN" -fi - -echo "Generating genesis block" -$CONFIGTXGEN -profile TwoOrgsOrdererGenesis -outputBlock crypto/orderer/orderer.block - -echo "Generating channel configuration transaction" -$CONFIGTXGEN -profile TwoOrgsChannel -outputCreateChannelTx crypto/orderer/channel.tx -channelID $CHANNEL_NAME - -echo "Generating anchor peer update for Org0MSP" -$CONFIGTXGEN -profile TwoOrgsChannel -outputAnchorPeersUpdate crypto/orderer/Org0MSPanchors.tx -channelID $CHANNEL_NAME -asOrg Org0MSP - -echo "Generating anchor peer update for Org1MSP" -$CONFIGTXGEN -profile TwoOrgsChannel -outputAnchorPeersUpdate crypto/orderer/Org1MSPanchors.tx -channelID $CHANNEL_NAME -asOrg Org1MSP diff --git a/examples/e2e_cli/network_setup.sh b/examples/e2e_cli/network_setup.sh index de640aa3beb..b044e47a662 100755 --- a/examples/e2e_cli/network_setup.sh +++ b/examples/e2e_cli/network_setup.sh @@ -1,9 +1,13 @@ #!/bin/bash -UP_DOWN=$1 -CH_NAME=$2 +UP_DOWN="$1" +CH_NAME="$2" +CLI_TIMEOUT="$3" -COMPOSE_FILE=docker-compose.yaml +: ${CLI_TIMEOUT:="10000"} + +COMPOSE_FILE=docker-compose-cli.yaml +#COMPOSE_FILE=docker-compose-e2e.yaml function printHelp () { echo "Usage: ./network_setup " @@ -40,24 +44,29 @@ function removeUnwantedImages() { } function networkUp () { - CURRENT_DIR=$PWD - source generateCfgTrx.sh $CH_NAME - cd $CURRENT_DIR + #Generate all the artifacts that includes org certs, orderer genesis block, + # channel configuration transaction + source generateArtifacts.sh $CH_NAME - CHANNEL_NAME=$CH_NAME docker-compose -f $COMPOSE_FILE up -d 2>&1 - if [ $? -ne 0 ]; then - echo "ERROR !!!! Unable to pull the images " - exit 1 - fi - docker logs -f cli + CHANNEL_NAME=$CH_NAME TIMEOUT=$CLI_TIMEOUT docker-compose -f $COMPOSE_FILE up -d 2>&1 + if [ $? -ne 0 ]; then + echo "ERROR !!!! Unable to pull the images " + exit 1 + fi + docker logs -f cli } function networkDown () { - docker-compose -f $COMPOSE_FILE down - #Cleanup the chaincode containers - clearContainers - #Cleanup images - removeUnwantedImages + docker-compose -f $COMPOSE_FILE down + + #Cleanup the chaincode containers + clearContainers + + #Cleanup images + removeUnwantedImages + + # remove orderer block and other channel configuration transactions and certs + rm -rf channel-artifacts/*.block channel-artifacts/*.tx crypto-config } validateArgs diff --git a/examples/e2e_cli/peer-base/peer-base-no-tls.yaml b/examples/e2e_cli/peer-base/peer-base-no-tls.yaml deleted file mode 100644 index 19f3a7fea09..00000000000 --- a/examples/e2e_cli/peer-base/peer-base-no-tls.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: '2' -services: - peer-base: - image: hyperledger/fabric-peer - environment: - - CORE_PEER_ADDRESSAUTODETECT=true - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=e2ecli_default - - CORE_LOGGING_LEVEL=ERROR - #- CORE_LOGGING_LEVEL=DEBUG - - CORE_NEXT=true - - CORE_PEER_TLS_ENABLED=false - - CORE_PEER_ENDORSER_ENABLED=true - - CORE_PEER_GOSSIP_ORGLEADER=false - - CORE_PEER_GOSSIP_USELEADERELECTION=true - - CORE_PEER_PROFILE_ENABLED=true - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer - command: peer node start --peer-defaultchain=false diff --git a/examples/e2e_cli/scripts/script.sh b/examples/e2e_cli/scripts/script.sh index 13e966952ee..6c1b44591e5 100755 --- a/examples/e2e_cli/scripts/script.sh +++ b/examples/e2e_cli/scripts/script.sh @@ -1,11 +1,19 @@ #!/bin/bash +echo +echo " ____ _____ _ ____ _____ _____ ____ _____ " +echo "/ ___| |_ _| / \ | _ \ |_ _| | ____| |___ \ | ____|" +echo "\___ \ | | / _ \ | |_) | | | _____ | _| __) | | _| " +echo " ___) | | | / ___ \ | _ < | | |_____| | |___ / __/ | |___ " +echo "|____/ |_| /_/ \_\ |_| \_\ |_| |_____| |_____| |_____|" +echo + CHANNEL_NAME="$1" : ${CHANNEL_NAME:="mychannel"} : ${TIMEOUT:="60"} -COUNTER=0 +COUNTER=1 MAX_RETRY=5 -ORDERER_CA=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/orderer/localMspConfig/cacerts/ordererOrg0.pem +ORDERER_CA=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem echo "Channel name : "$CHANNEL_NAME @@ -20,27 +28,37 @@ verifyResult () { setGlobals () { - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer$1/localMspConfig - CORE_PEER_ADDRESS=peer$1:7051 - if [ $1 -eq 0 -o $1 -eq 1 ] ; then - CORE_PEER_LOCALMSPID="Org0MSP" - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer$1/localMspConfig/cacerts/peerOrg0.pem - else CORE_PEER_LOCALMSPID="Org1MSP" - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer$1/localMspConfig/cacerts/peerOrg1.pem + CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt + CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp + if [ $1 -eq 0 ]; then + CORE_PEER_ADDRESS=peer0.org1.example.com:7051 + else + CORE_PEER_ADDRESS=peer1.org1.example.com:7051 + CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp + fi + else + CORE_PEER_LOCALMSPID="Org2MSP" + CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt + CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp + if [ $1 -eq 2 ]; then + CORE_PEER_ADDRESS=peer0.org2.example.com:7051 + else + CORE_PEER_ADDRESS=peer1.org2.example.com:7051 + fi fi + env |grep CORE } createChannel() { - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig - CORE_PEER_LOCALMSPID="Org0MSP" + setGlobals 0 if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - peer channel create -o orderer0:7050 -c $CHANNEL_NAME -f crypto/orderer/channel.tx >&log.txt + peer channel create -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/channel.tx >&log.txt else - peer channel create -o orderer0:7050 -c $CHANNEL_NAME -f crypto/orderer/channel.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA >&log.txt + peer channel create -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/channel.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA >&log.txt fi res=$? cat log.txt @@ -54,14 +72,14 @@ updateAnchorPeers() { setGlobals $PEER if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - peer channel create -o orderer0:7050 -c $CHANNEL_NAME -f crypto/orderer/${CORE_PEER_LOCALMSPID}anchors.tx >&log.txt + peer channel create -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/${CORE_PEER_LOCALMSPID}anchors.tx >&log.txt else - peer channel create -o orderer0:7050 -c $CHANNEL_NAME -f crypto/orderer/${CORE_PEER_LOCALMSPID}anchors.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA >&log.txt + peer channel create -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/${CORE_PEER_LOCALMSPID}anchors.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA >&log.txt fi res=$? cat log.txt verifyResult $res "Anchor peer update failed" - echo "===================== Anchor peers for org \"$CORE_PEER_LOCALMSPID}\" on \"$CHANNEL_NAME\" is updated successfully ===================== " + echo "===================== Anchor peers for org \"$CORE_PEER_LOCALMSPID\" on \"$CHANNEL_NAME\" is updated successfully ===================== " echo } @@ -76,7 +94,7 @@ joinWithRetry () { sleep 2 joinWithRetry $1 else - COUNTER=0 + COUNTER=1 fi verifyResult $res "After $MAX_RETRY attempts, PEER$ch has failed to Join the Channel" } @@ -106,9 +124,9 @@ instantiateChaincode () { PEER=$1 setGlobals $PEER if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - peer chaincode instantiate -o orderer0:7050 -C $CHANNEL_NAME -n mycc -v 1.0 -c '{"Args":["init","a","100","b","200"]}' -P "OR ('Org0MSP.member','Org1MSP.member')" >&log.txt + peer chaincode instantiate -o orderer.example.com:7050 -C $CHANNEL_NAME -n mycc -v 1.0 -c '{"Args":["init","a","100","b","200"]}' -P "OR ('Org1MSP.member','Org2MSP.member')" >&log.txt else - peer chaincode instantiate -o orderer0:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n mycc -v 1.0 -c '{"Args":["init","a","100","b","200"]}' -P "OR ('Org0MSP.member','Org1MSP.member')" >&log.txt + peer chaincode instantiate -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n mycc -v 1.0 -c '{"Args":["init","a","100","b","200"]}' -P "OR ('Org1MSP.member','Org2MSP.member')" >&log.txt fi res=$? cat log.txt @@ -142,15 +160,17 @@ chaincodeQuery () { echo "!!!!!!!!!!!!!!! Query result on PEER$PEER is INVALID !!!!!!!!!!!!!!!!" echo "================== ERROR !!! FAILED to execute End-2-End Scenario ==================" echo + exit 1 fi } chaincodeInvoke () { PEER=$1 + setGlobals $PEER if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - peer chaincode invoke -o orderer0:7050 -C $CHANNEL_NAME -n mycc -c '{"Args":["invoke","a","b","10"]}' >&log.txt + peer chaincode invoke -o orderer.example.com:7050 -C $CHANNEL_NAME -n mycc -c '{"Args":["invoke","a","b","10"]}' >&log.txt else - peer chaincode invoke -o orderer0:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n mycc -c '{"Args":["invoke","a","b","10"]}' >&log.txt + peer chaincode invoke -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n mycc -c '{"Args":["invoke","a","b","10"]}' >&log.txt fi res=$? cat log.txt @@ -169,28 +189,37 @@ joinChannel updateAnchorPeers 0 updateAnchorPeers 2 -## Install chaincode on Peer0/Org0 and Peer2/Org1 +## Install chaincode on Peer0/Org1 and Peer2/Org2 installChaincode 0 installChaincode 2 -#Instantiate chaincode on Peer2/Org1 -echo "Instantiating chaincode on Peer2/Org1 ..." +#Instantiate chaincode on Peer2/Org2 +echo "Instantiating chaincode on Peer2/Org2 ..." instantiateChaincode 2 -#Query on chaincode on Peer0/Org0 +#Query on chaincode on Peer0/Org2 chaincodeQuery 0 100 -#Invoke on chaincode on Peer0/Org0 -echo "send Invoke transaction on Peer0/Org0 ..." +#Invoke on chaincode on Peer0/Org2 +echo "send Invoke transaction on Peer0/Org2 ..." chaincodeInvoke 0 -## Install chaincode on Peer3/Org1 +## Install chaincode on Peer3/Org2 installChaincode 3 -#Query on chaincode on Peer3/Org1, check if the result is 90 +#Query on chaincode on Peer3/Org2, check if the result is 90 chaincodeQuery 3 90 echo echo "===================== All GOOD, End-2-End execution completed ===================== " echo + +echo +echo " _____ _ _ ____ _____ ____ _____ " +echo "| ____| | \ | | | _ \ | ____| |___ \ | ____|" +echo "| _| | \| | | | | | _____ | _| __) | | _| " +echo "| |___ | |\ | | |_| | |_____| | |___ / __/ | |___ " +echo "|_____| |_| \_| |____/ |_____| |_____| |_____|" +echo + exit 0