diff --git a/hyperledger_fabric/v1.0.2/Makefile b/hyperledger_fabric/v1.0.2/Makefile index 8017207a..973370ce 100644 --- a/hyperledger_fabric/v1.0.2/Makefile +++ b/hyperledger_fabric/v1.0.2/Makefile @@ -118,8 +118,8 @@ logs_save: # save logs logs_view: # view logs less /tmp/dev_peer.log -gen_e2e: # generate e2e_cli artifacts - cd e2e_cli && bash gen_artifacts.sh +gen_e2e: # generate solo artifacts + cd solo && bash gen_artifacts.sh gen_kafka: # generate kafka artifacts cd kafka && bash gen_artifacts.sh diff --git a/hyperledger_fabric/v1.0.2/docker-compose-2orgs-4peers-event.yaml b/hyperledger_fabric/v1.0.2/docker-compose-2orgs-4peers-event.yaml index 5ea09dd6..1efe18eb 100644 --- a/hyperledger_fabric/v1.0.2/docker-compose-2orgs-4peers-event.yaml +++ b/hyperledger_fabric/v1.0.2/docker-compose-2orgs-4peers-event.yaml @@ -65,11 +65,11 @@ services: - 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 volumes: - #- ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples - - ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - - ./e2e_cli/channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts - - ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml - - ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml + #- ./solo/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples + - ./solo/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ + - ./solo/channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts + - ./solo/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml + - ./solo/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ depends_on: - orderer.example.com diff --git a/hyperledger_fabric/v1.0.2/docker-compose-base-dev.yaml b/hyperledger_fabric/v1.0.2/docker-compose-base-dev.yaml index 8af2bc84..01c5d31d 100644 --- a/hyperledger_fabric/v1.0.2/docker-compose-base-dev.yaml +++ b/hyperledger_fabric/v1.0.2/docker-compose-base-dev.yaml @@ -23,10 +23,10 @@ services: - ORDERER_KAFKA_VERBOSE=true volumes: - $GOPATH/src/github.com/hyperledger/fabric:/go/src/github.com/hyperledger/fabric - # for e2e_cli case - #- ./e2e_cli/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block - #- ./e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp - #- ./e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls + # for solo case + #- ./solo/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block + #- ./solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp + #- ./solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls # for kafka case - ./kafka/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block - ./kafka/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp @@ -50,8 +50,8 @@ services: volumes: - $GOPATH/src/github.com/hyperledger/fabric:/go/src/github.com/hyperledger/fabric # e2e mode configuration - #- ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp - #- ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls + #- ./solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp + #- ./solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls # kafka mode configuration - ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp - ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls @@ -83,11 +83,11 @@ services: - /tmp/:/tmp/ - ./scripts:/tmp/scripts # e2e mode configuration - #- ./e2e_cli/channel-artifacts:/tmp/channel-artifacts - #- ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml - #- ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml - #- ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto - #- ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples + #- ./solo/channel-artifacts:/tmp/channel-artifacts + #- ./solo/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml + #- ./solo/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml + #- ./solo/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto + #- ./solo/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples # kafka mode configuration - ./kafka/channel-artifacts:/tmp/channel-artifacts - ./kafka/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml diff --git a/hyperledger_fabric/v1.0.2/docker-compose-base-e2e.yaml b/hyperledger_fabric/v1.0.2/docker-compose-base-e2e.yaml index 9997e880..e77da8be 100644 --- a/hyperledger_fabric/v1.0.2/docker-compose-base-e2e.yaml +++ b/hyperledger_fabric/v1.0.2/docker-compose-base-e2e.yaml @@ -25,7 +25,7 @@ services: ports: - "7054:7054" volumes: - - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + - ./solo/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config 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/c843d3f021118963ce5d340e95286e8869bb7bd051454cd4166aa2887a2ad451_sk -b admin:adminpw -d' ca.org2.example.com: @@ -41,7 +41,7 @@ services: ports: - "8054:7054" volumes: - - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + - ./solo/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config 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/1ee551a8753171c0377366e96a1d7ec01afddb868c9483cc501b6f8ac7ae752f_sk -b admin:adminpw -d' orderer.example.com: # There can be multiple orderers @@ -53,9 +53,9 @@ services: ports: - "7050:7050" volumes: - - ./e2e_cli/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block - - ./e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp - - ./e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls + - ./solo/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block + - ./solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp + - ./solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls command: orderer start cli: @@ -77,11 +77,11 @@ services: volumes: #- ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - ./scripts:/tmp/scripts - - ./e2e_cli/channel-artifacts:/tmp/channel-artifacts - - ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml - - ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml - - ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto - - ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples + - ./solo/channel-artifacts:/tmp/channel-artifacts + - ./solo/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml + - ./solo/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml + - ./solo/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto + - ./solo/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples ## following are peer nodes ## @@ -98,8 +98,8 @@ services: - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 - CORE_PEER_LOCALMSPID=Org1MSP volumes: - - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp - - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls + - ./solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp + - ./solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls ports: - 7051:7051 - 7052:7052 @@ -119,8 +119,8 @@ services: - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051 - CORE_PEER_LOCALMSPID=Org1MSP volumes: - - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp:/etc/hyperledger/fabric/msp - - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls:/etc/hyperledger/fabric/tls + - ./solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp:/etc/hyperledger/fabric/msp + - ./solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls:/etc/hyperledger/fabric/tls ports: - 8051:7051 - 8052:7052 @@ -140,8 +140,8 @@ services: - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:7051 - CORE_PEER_LOCALMSPID=Org2MSP volumes: - - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp:/etc/hyperledger/fabric/msp - - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls:/etc/hyperledger/fabric/tls + - ./solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp:/etc/hyperledger/fabric/msp + - ./solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls:/etc/hyperledger/fabric/tls ports: - 9051:7051 - 9052:7052 @@ -161,8 +161,8 @@ services: - CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org2.example.com:7051 - CORE_PEER_LOCALMSPID=Org2MSP volumes: - - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp:/etc/hyperledger/fabric/msp - - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls:/etc/hyperledger/fabric/tls + - ./solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp:/etc/hyperledger/fabric/msp + - ./solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls:/etc/hyperledger/fabric/tls ports: - 10051:7051 - 10052:7052 diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/base/docker-compose-base.yaml b/hyperledger_fabric/v1.0.2/solo/base/docker-compose-base.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/base/docker-compose-base.yaml rename to hyperledger_fabric/v1.0.2/solo/base/docker-compose-base.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/base/peer-base.yaml b/hyperledger_fabric/v1.0.2/solo/base/peer-base.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/base/peer-base.yaml rename to hyperledger_fabric/v1.0.2/solo/base/peer-base.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/Org1MSPanchors.tx b/hyperledger_fabric/v1.0.2/solo/channel-artifacts/Org1MSPanchors.tx similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/Org1MSPanchors.tx rename to hyperledger_fabric/v1.0.2/solo/channel-artifacts/Org1MSPanchors.tx diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/Org2MSPanchors.tx b/hyperledger_fabric/v1.0.2/solo/channel-artifacts/Org2MSPanchors.tx similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/Org2MSPanchors.tx rename to hyperledger_fabric/v1.0.2/solo/channel-artifacts/Org2MSPanchors.tx diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/channel.tx b/hyperledger_fabric/v1.0.2/solo/channel-artifacts/channel.tx similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/channel.tx rename to hyperledger_fabric/v1.0.2/solo/channel-artifacts/channel.tx diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/orderer.genesis.block b/hyperledger_fabric/v1.0.2/solo/channel-artifacts/orderer.genesis.block similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/channel-artifacts/orderer.genesis.block rename to hyperledger_fabric/v1.0.2/solo/channel-artifacts/orderer.genesis.block diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/configtx.yaml b/hyperledger_fabric/v1.0.2/solo/configtx.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/configtx.yaml rename to hyperledger_fabric/v1.0.2/solo/configtx.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config.yaml b/hyperledger_fabric/v1.0.2/solo/crypto-config.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config.yaml rename to hyperledger_fabric/v1.0.2/solo/crypto-config.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/ca/2154dbdbd40ce79764ea957d136b0d5cadbfb14772f05fd2cf32cd0c32d69b77_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/ca/2154dbdbd40ce79764ea957d136b0d5cadbfb14772f05fd2cf32cd0c32d69b77_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/ca/2154dbdbd40ce79764ea957d136b0d5cadbfb14772f05fd2cf32cd0c32d69b77_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/ca/2154dbdbd40ce79764ea957d136b0d5cadbfb14772f05fd2cf32cd0c32d69b77_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/387d53008fabbc444d59d777bee7303daa9c62125dc5e7086338cedd47ae498f_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/387d53008fabbc444d59d777bee7303daa9c62125dc5e7086338cedd47ae498f_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/387d53008fabbc444d59d777bee7303daa9c62125dc5e7086338cedd47ae498f_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/387d53008fabbc444d59d777bee7303daa9c62125dc5e7086338cedd47ae498f_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/tlsca/80a80ffac9c59d2e259b0d7c9f811c274e08b949930d761e0314982751bf85c1_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/tlsca/80a80ffac9c59d2e259b0d7c9f811c274e08b949930d761e0314982751bf85c1_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/tlsca/80a80ffac9c59d2e259b0d7c9f811c274e08b949930d761e0314982751bf85c1_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/tlsca/80a80ffac9c59d2e259b0d7c9f811c274e08b949930d761e0314982751bf85c1_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/a54bc31e91249b68eb23dc374296a4eda4fe8f0e229dcfb63770c7e45b96745f_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/a54bc31e91249b68eb23dc374296a4eda4fe8f0e229dcfb63770c7e45b96745f_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/a54bc31e91249b68eb23dc374296a4eda4fe8f0e229dcfb63770c7e45b96745f_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/a54bc31e91249b68eb23dc374296a4eda4fe8f0e229dcfb63770c7e45b96745f_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/ca/c843d3f021118963ce5d340e95286e8869bb7bd051454cd4166aa2887a2ad451_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/ca/c843d3f021118963ce5d340e95286e8869bb7bd051454cd4166aa2887a2ad451_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/ca/c843d3f021118963ce5d340e95286e8869bb7bd051454cd4166aa2887a2ad451_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/ca/c843d3f021118963ce5d340e95286e8869bb7bd051454cd4166aa2887a2ad451_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/99bd297aa7c0a5139386ce35b89c2524b5bc23fa9e6e0968c93cbcf27b2d10e4_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/99bd297aa7c0a5139386ce35b89c2524b5bc23fa9e6e0968c93cbcf27b2d10e4_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/99bd297aa7c0a5139386ce35b89c2524b5bc23fa9e6e0968c93cbcf27b2d10e4_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/99bd297aa7c0a5139386ce35b89c2524b5bc23fa9e6e0968c93cbcf27b2d10e4_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/a5b3e0ca079850544f7a1381629dada8e62bf2b5f180ac6e49c79a70c40858e2_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/a5b3e0ca079850544f7a1381629dada8e62bf2b5f180ac6e49c79a70c40858e2_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/a5b3e0ca079850544f7a1381629dada8e62bf2b5f180ac6e49c79a70c40858e2_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/a5b3e0ca079850544f7a1381629dada8e62bf2b5f180ac6e49c79a70c40858e2_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/tlsca/c55d035fc8d7e68750c9e7001855786c12e356170090a2d3e4cd4477705b40dc_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/tlsca/c55d035fc8d7e68750c9e7001855786c12e356170090a2d3e4cd4477705b40dc_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/tlsca/c55d035fc8d7e68750c9e7001855786c12e356170090a2d3e4cd4477705b40dc_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/tlsca/c55d035fc8d7e68750c9e7001855786c12e356170090a2d3e4cd4477705b40dc_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/d404db0397d50cf0b1a5d028561e78a2b47935e318ec1800de5fc5c164dae9ae_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/d404db0397d50cf0b1a5d028561e78a2b47935e318ec1800de5fc5c164dae9ae_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/d404db0397d50cf0b1a5d028561e78a2b47935e318ec1800de5fc5c164dae9ae_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/d404db0397d50cf0b1a5d028561e78a2b47935e318ec1800de5fc5c164dae9ae_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/6200c95bc5314763ddca31ad86ce6f18989d35301fbdf10582e31a872da8200e_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/6200c95bc5314763ddca31ad86ce6f18989d35301fbdf10582e31a872da8200e_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/6200c95bc5314763ddca31ad86ce6f18989d35301fbdf10582e31a872da8200e_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/6200c95bc5314763ddca31ad86ce6f18989d35301fbdf10582e31a872da8200e_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/ca/1ee551a8753171c0377366e96a1d7ec01afddb868c9483cc501b6f8ac7ae752f_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/ca/1ee551a8753171c0377366e96a1d7ec01afddb868c9483cc501b6f8ac7ae752f_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/ca/1ee551a8753171c0377366e96a1d7ec01afddb868c9483cc501b6f8ac7ae752f_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/ca/1ee551a8753171c0377366e96a1d7ec01afddb868c9483cc501b6f8ac7ae752f_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/55f89f6171583cc40724941aa0954c8d339a2a293c5643a3217a55c6b14668cc_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/55f89f6171583cc40724941aa0954c8d339a2a293c5643a3217a55c6b14668cc_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/55f89f6171583cc40724941aa0954c8d339a2a293c5643a3217a55c6b14668cc_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/55f89f6171583cc40724941aa0954c8d339a2a293c5643a3217a55c6b14668cc_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/ec648ac689f099ccf1b79d56e17acad0701f44e9b6c08f99af1b7fb0220808e7_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/ec648ac689f099ccf1b79d56e17acad0701f44e9b6c08f99af1b7fb0220808e7_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/ec648ac689f099ccf1b79d56e17acad0701f44e9b6c08f99af1b7fb0220808e7_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/ec648ac689f099ccf1b79d56e17acad0701f44e9b6c08f99af1b7fb0220808e7_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/tlsca/2c8b536d3fd4a3284adcbb885f423988e6037b16e2cba7e0c1ee2c074f8d1821_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/tlsca/2c8b536d3fd4a3284adcbb885f423988e6037b16e2cba7e0c1ee2c074f8d1821_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/tlsca/2c8b536d3fd4a3284adcbb885f423988e6037b16e2cba7e0c1ee2c074f8d1821_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/tlsca/2c8b536d3fd4a3284adcbb885f423988e6037b16e2cba7e0c1ee2c074f8d1821_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/ed4e11d28881807d16d07609be517005a9905816bc2fc2ab3aece92e0daff4c8_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/ed4e11d28881807d16d07609be517005a9905816bc2fc2ab3aece92e0daff4c8_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/ed4e11d28881807d16d07609be517005a9905816bc2fc2ab3aece92e0daff4c8_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/ed4e11d28881807d16d07609be517005a9905816bc2fc2ab3aece92e0daff4c8_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/37d54f666be5b439c52b5503cd8efaed2db1095645a9ec5a6ff6276ed6e24893_sk b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/37d54f666be5b439c52b5503cd8efaed2db1095645a9ec5a6ff6276ed6e24893_sk similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/37d54f666be5b439c52b5503cd8efaed2db1095645a9ec5a6ff6276ed6e24893_sk rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/37d54f666be5b439c52b5503cd8efaed2db1095645a9ec5a6ff6276ed6e24893_sk diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key b/hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key rename to hyperledger_fabric/v1.0.2/solo/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-cli.yaml b/hyperledger_fabric/v1.0.2/solo/docker-compose-cli.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-cli.yaml rename to hyperledger_fabric/v1.0.2/solo/docker-compose-cli.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-couch.yaml b/hyperledger_fabric/v1.0.2/solo/docker-compose-couch.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-couch.yaml rename to hyperledger_fabric/v1.0.2/solo/docker-compose-couch.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-e2e-template.yaml b/hyperledger_fabric/v1.0.2/solo/docker-compose-e2e-template.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-e2e-template.yaml rename to hyperledger_fabric/v1.0.2/solo/docker-compose-e2e-template.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-e2e.yaml b/hyperledger_fabric/v1.0.2/solo/docker-compose-e2e.yaml similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/docker-compose-e2e.yaml rename to hyperledger_fabric/v1.0.2/solo/docker-compose-e2e.yaml diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/download-dockerimages.sh b/hyperledger_fabric/v1.0.2/solo/download-dockerimages.sh similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/download-dockerimages.sh rename to hyperledger_fabric/v1.0.2/solo/download-dockerimages.sh diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/end-to-end.rst b/hyperledger_fabric/v1.0.2/solo/end-to-end.rst similarity index 98% rename from hyperledger_fabric/v1.0.2/e2e_cli/end-to-end.rst rename to hyperledger_fabric/v1.0.2/solo/end-to-end.rst index 9f187339..7c0effa2 100644 --- a/hyperledger_fabric/v1.0.2/e2e_cli/end-to-end.rst +++ b/hyperledger_fabric/v1.0.2/solo/end-to-end.rst @@ -186,13 +186,13 @@ subsequently output these files into the ``channel-artifacts`` folder. Run the shell script ^^^^^^^^^^^^^^^^^^^^ -Make sure you are in the ``examples/e2e_cli`` directory where the script resides. +Make sure you are in the ``examples/solo`` directory where the script resides. Decide upon a unique name for your channel and replace the parm with a name of your choice. The script will fail if you do not supply a name. .. code:: bash - cd examples/e2e_cli + cd examples/solo ./generateArtifacts.sh The output of the script is somewhat verbose, as it generates the crypto @@ -253,7 +253,7 @@ Check to make sure it is set properly: Now let's run the tool. Our platform specific binary is in the ``release`` directory, so we need to provide the relative path to where the tool resides. -Make sure you are in ``examples/e2e_cli``: +Make sure you are in ``examples/solo``: .. code:: bash @@ -306,7 +306,7 @@ Define the anchor peer for Org2 on the channel: Run the end-to-end test with Docker ----------------------------------- -Make sure you are in the ``/e2e_cli`` directory. Then use docker-compose +Make sure you are in the ``/solo`` directory. Then use docker-compose to spawn the network entities and drive the tests. Notice that you can set a ``TIMEOUT`` variable (specified in seconds) so that your cli container does not exit after the script completes. You can choose any value: @@ -495,7 +495,7 @@ OR Understanding the docker-compose topology ----------------------------------------- -The ``e2e_cli`` folder offers us two flavors of docker-compose files, both of which +The ``solo`` folder offers us two flavors of docker-compose files, both of which are extended from the ``docker-compose-base.yaml``. Our first flavor, ``docker-compose-cli.yaml``, provides us with a CLI container, along with an orderer, four peers, and the optional couchDB containers. We use this docker-compose for @@ -570,13 +570,13 @@ left of the command. For example: working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer # command: /bin/bash -c './scripts/script.sh ${CHANNEL_NAME}; sleep $TIMEOUT' -Save the file and return to the ``/e2e_cli`` directory. +Save the file and return to the ``/solo`` directory. Now restart your network: .. code:: bash - # make sure you are in the /e2e_cli directory where your docker-compose script resides + # make sure you are in the /solo directory where your docker-compose script resides CHANNEL_NAME= TIMEOUT= docker-compose -f docker-compose-cli.yaml up -d If you want to see the realtime logs for your network, then do not supply the ``-d`` flag. @@ -724,7 +724,7 @@ the network pass the couchdb docker-compose as well: .. code:: bash - # make sure you are in the /e2e_cli directory where your docker-compose script resides + # make sure you are in the /solo directory where your docker-compose script resides CHANNEL_NAME= TIMEOUT= docker-compose -f docker-compose-cli.yaml -f docker-compose-couch.yaml up -d **chaincode_example02** should now work using CouchDB underneath. diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/examples/chaincode/go/chaincode_example02/chaincode_example02.go b/hyperledger_fabric/v1.0.2/solo/examples/chaincode/go/chaincode_example02/chaincode_example02.go similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/examples/chaincode/go/chaincode_example02/chaincode_example02.go rename to hyperledger_fabric/v1.0.2/solo/examples/chaincode/go/chaincode_example02/chaincode_example02.go diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/network_setup.sh b/hyperledger_fabric/v1.0.2/solo/network_setup.sh similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/network_setup.sh rename to hyperledger_fabric/v1.0.2/solo/network_setup.sh diff --git a/hyperledger_fabric/v1.0.2/e2e_cli/scripts/script.sh b/hyperledger_fabric/v1.0.2/solo/scripts/script.sh similarity index 100% rename from hyperledger_fabric/v1.0.2/e2e_cli/scripts/script.sh rename to hyperledger_fabric/v1.0.2/solo/scripts/script.sh