diff --git a/.gitignore b/.gitignore index f47d260372..fdf94e1ad9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,11 +19,13 @@ tmp *.heapsnapshot #test files +test/fixtures/crypto-material/crypto-config/ +test/fixtures/crypto-material/channel-config/ +test/fixtures/crypto-material/config-base/twoorgs.genesis.block +test/fixtures/fabricca/enroll*.* +test/fixtures/fabricca/test*.* test/typescript/**/*.js test/typescript/**/*.js.map -test/fixtures/src/node_cc/example_cc/.npmrc -test/fixtures/src/node_cc/example_cc1/.npmrc -test/fixtures/src/github.com/example_cc/junk.go #fabric client fabric-client/.DS_Store diff --git a/README.md b/README.md index 66b0704e27..5476eec911 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Clone the project and launch the following commands to install the dependencies In the project root folder: * `npm install` to install dependencies * optionally, `gulp docs` to generate API docs if you want to review the doc content +* `install-and-generate-certs` to generate the required crypto material used by the tests * `npm test` or `gulp test-headless` to run the headless tests that do not require any additional set up The following tests require setting up a local blockchain network as the target. You need to build the necessary Docker images required to run the network. Follow the steps below to set it up. diff --git a/build/tasks/certs.js b/build/tasks/certs.js new file mode 100644 index 0000000000..fe486819d2 --- /dev/null +++ b/build/tasks/certs.js @@ -0,0 +1,66 @@ +/* +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +*/ + +const gulp = require('gulp'); +const shell = require('gulp-shell'); +const runSequence = require('run-sequence'); + +const version = '1.4.0'; +const binariesPath = '/tmp/fabric-binaries'; +const darwinTarFile = 'hyperledger-fabric-darwin-amd64-' + version + '.tar.gz'; +const amd64TarFile = 'hyperledger-fabric-linux-amd64-' + version + '.tar.gz'; +const s390TarFile = 'hyperledger-fabric-linux-s390x-' + version + '.tar.gz'; +const darwin = 'darwin-amd64-' + version + '/' + darwinTarFile; +const amd64 = 'linux-amd64-' + version + '/' + amd64TarFile; +const s390 = 'linux-s390x-' + version + '/' + s390TarFile; +const binariesRoot = 'https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/'; +const darwinBinaries = binariesRoot + darwin; +const amd64Binaries = binariesRoot + amd64; +const s390Binaries = binariesRoot + s390; + +// Retrieve the cryptogen material binaries, pinned at 1.4 +// Download and xxtract binaries from tar file +// Set to path via export +gulp.task('get-crypto-binaries-amd64', shell.task( + 'mkdir -p ' + binariesPath + ';' + + 'wget ' + amd64Binaries + ' -P ' + binariesPath + ';' + + 'tar xvzf ' + binariesPath + '/' + amd64TarFile + ' -C ' + binariesPath + ';') +); + +gulp.task('get-crypto-binaries-mac', shell.task( + 'mkdir -p ' + binariesPath + ';' + + 'wget ' + darwinBinaries + ' -P ' + binariesPath + ';' + + 'tar xvzf ' + binariesPath + '/' + darwinTarFile + ' -C ' + binariesPath + ';') +); + +gulp.task('get-crypto-binaries-s390', shell.task( + 'mkdir -p ' + binariesPath + ';' + + 'wget ' + s390Binaries + ' -P ' + binariesPath + ';' + + 'tar xvzf ' + binariesPath + '/' + s390TarFile + ' -C ' + binariesPath + ';') +); + +// Generate required crypto material, channel tx blocks, and fabric ca certs +// - shell command to run the required test file scripts +gulp.task('generate-test-certs', shell.task( + './test/fixtures/crypto-material/generateAll.sh ' + binariesPath + '/bin;' + + './test/fixtures/fabricca/generateCSR.sh;') +); + +// Perform both of the above sequentially +gulp.task('install-and-generate-certs', (done) => { + const tasks = ['get-crypto-binaries-amd64', 'generate-test-certs']; + runSequence(...tasks, done); +}); + +gulp.task('install-and-generate-certs-mac', (done) => { + const tasks = ['get-crypto-binaries-mac', 'generate-test-certs']; + runSequence(...tasks, done); +}); + +gulp.task('install-and-generate-certs-s390', (done) => { + const tasks = ['get-crypto-binaries-s390', 'generate-test-certs']; + runSequence(...tasks, done); +}); diff --git a/scripts/Jenkins_Scripts/CI_Script.sh b/scripts/Jenkins_Scripts/CI_Script.sh index 12f111a6bd..dee66819d8 100755 --- a/scripts/Jenkins_Scripts/CI_Script.sh +++ b/scripts/Jenkins_Scripts/CI_Script.sh @@ -92,7 +92,7 @@ function removeUnwantedImages() { rm -rf $HOME/.node-gyp/ $HOME/.npm/ $HOME/.npmrc || true # remove tmp/hfc and hfc-key-store data -rm -rf /home/jenkins/npm /tmp/fabric-shim /tmp/hfc* /tmp/npm* /home/jenkins/kvsTemp /home/jenkins/.hfc-key-store +rm -rf /home/jenkins/npm /tmp/fabric-shim /tmp/hfc* /tmp/npm* /home/jenkins/kvsTemp /home/jenkins/.hfc-key-store /tmp/fabric-binaries rm -rf /var/hyperledger/* @@ -191,6 +191,15 @@ sdk_E2e_Tests() { # Install NPM before start the tests install_Npm + # Generate crypto material before running the tests + if [ $ARCH == "s390x" ]; then + # Run the s390x gulp task + gulp install-and-generate-certs-s390 || err_Check "ERROR!!! gulp install and generation of test certificates failed" + else + # Run the amd64 gulp task + gulp install-and-generate-certs || err_Check "ERROR!!! gulp install and generation of test certificates failed" + fi + echo -e "\033[32m Execute Headless and Integration Tests" "\033[0m" gulp test || err_Check "ERROR!!! gulp test failed" diff --git a/test/README.md b/test/README.md index 5017b944c7..4caaea4137 100644 --- a/test/README.md +++ b/test/README.md @@ -13,6 +13,12 @@ The functional tests are currently written in [Tape](https://github.com/substack The scenario tests are written in [Cucumber](https://github.com/cucumber/cucumber-js), with the intention of providing high level test coverage from a scenario perspective. For more information, please refer to the [README](./scenario/README.md) within the scenario directory. +Test certificates are set to expire a year after generation. Due to this the test suite generates new certificates as part of the build process, and is a manual requirement prior to running the tests locally. This process is orchestrated using gulp files that: + - Download, install and export the path to the 1.4 Hyperledger Fabric binaries used for generating crypto material + - Generate the crypto-material, matching channel blocks and fabric-ca certificates required by the docker-compose files and test suites + +Use the gulp task `gulp install-and-generate-certs` to perform the above on a linux x64 machine, or `gulp install-and-generate-certs-mac` for a mac. This is only required to be performed upon initial project clone, and then yearly afterwards. + ## Structure The folder structure is the following: @@ -28,7 +34,7 @@ test └───unit ``` -- `fixtures` holds all the configuration files used by the integration tests +- `fixtures` holds all the configuration files used by the integration and scenario tests - `integration` contains the interation test suite - `scenario` contains the sceanrio test suite - `typescript` contains the typescript test suite diff --git a/test/fixtures/crypto-material/README.md b/test/fixtures/crypto-material/README.md index b6d61cc7b6..4e547ce7d1 100644 --- a/test/fixtures/crypto-material/README.md +++ b/test/fixtures/crypto-material/README.md @@ -1,12 +1,3 @@ -Cryptogen created using fabric 1.4 level cryptogen using `generate.sh` - -Mulitple configs are generated: -- config-base, does not include anchor peers -- config-update, used to update anchor peers - -Both folders contain a ./generate.sh to run, that creates new material to be used. A smart person would use a script to run them both, that's what `generateAll.sh` does - -Don't forget: -- export the cryptogen path before you run the command, toherwise it will fail, and you will cry - -The above is to be automated in the build so that we create new material prior to evey test, which will prevent certifaicate expiration issues. +All crypto material here is generated via the contained shell scripts files and orchestrated by the parent gulp files `/build/tasks/certs.js`, please use the gulp files to create any required certificates by: +- Obtain crypto-gen binaries (`gulp get-crypto-binaries`) +- Generate the crypto material required for tests (`gulp generate-test-certs`) diff --git a/test/fixtures/crypto-material/channel-config/adminconfig.tx b/test/fixtures/crypto-material/channel-config/adminconfig.tx deleted file mode 100644 index 843aec9389..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/adminconfig.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/channel-config/discovery.tx b/test/fixtures/crypto-material/channel-config/discovery.tx deleted file mode 100644 index be175289c6..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/discovery.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/channel-config/discovery_anchor.tx b/test/fixtures/crypto-material/channel-config/discovery_anchor.tx deleted file mode 100644 index 94dfbc99f0..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/discovery_anchor.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/channel-config/mychannel-org1anchor.tx b/test/fixtures/crypto-material/channel-config/mychannel-org1anchor.tx deleted file mode 100644 index 686647e80f..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/mychannel-org1anchor.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/channel-config/mychannel.tx b/test/fixtures/crypto-material/channel-config/mychannel.tx deleted file mode 100644 index 0dab1bd3db..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/mychannel.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/channel-config/mychannel2.tx b/test/fixtures/crypto-material/channel-config/mychannel2.tx deleted file mode 100644 index 6d92e3fa8d..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/mychannel2.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/channel-config/mychannelts.tx b/test/fixtures/crypto-material/channel-config/mychannelts.tx deleted file mode 100644 index c1dd92a703..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/mychannelts.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/channel-config/mychanneltx.tx b/test/fixtures/crypto-material/channel-config/mychanneltx.tx deleted file mode 100644 index 883d7fd937..0000000000 Binary files a/test/fixtures/crypto-material/channel-config/mychanneltx.tx and /dev/null differ diff --git a/test/fixtures/crypto-material/config-base/configtx.yaml b/test/fixtures/crypto-material/config-base/configtx.yaml index c63e4228b2..18a624db3e 100644 --- a/test/fixtures/crypto-material/config-base/configtx.yaml +++ b/test/fixtures/crypto-material/config-base/configtx.yaml @@ -14,45 +14,45 @@ ################################################################################ Application: &ApplicationDefaults - # Organizations is the list of orgs which are defined as participants on - # the application side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Application policies, their canonical path is - # /Channel/Application/ - Policies: &ApplicationDefaultPolicies - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" + # Organizations is the list of orgs which are defined as participants on + # the application side of the network + Organizations: + +# Policies defines the set of policies at this level of the config tree +# For Application policies, their canonical path is +# /Channel/Application/ + Policies: &ApplicationDefaultPolicies + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" ################################################################################ # # SECTION: Capabilities ################################################################################ Capabilities: - # Channel capabilities apply to both the orderers and the peers and must be - # supported by both. Set the value of the capability to true to require it. - Channel: &ChannelCapabilities - V1_1: true - - # Orderer capabilities apply only to the orderers, and may be safely - # manipulated without concern for upgrading peers. Set the value of the - # capability to true to require it. - Orderer: &OrdererCapabilities - V1_1: true - - # Application capabilities apply only to the peer network, and may be - # safely manipulated without concern for upgrading orderers. Set the value - # of the capability to true to require it. - Application: &ApplicationCapabilities - V1_2: true - V1_1: false + # Channel capabilities apply to both the orderers and the peers and must be + # supported by both. Set the value of the capability to true to require it. + Channel: &ChannelCapabilities + V1_1: true + + # Orderer capabilities apply only to the orderers, and may be safely + # manipulated without concern for upgrading peers. Set the value of the + # capability to true to require it. + Orderer: &OrdererCapabilities + V1_1: true + + # Application capabilities apply only to the peer network, and may be + # safely manipulated without concern for upgrading orderers. Set the value + # of the capability to true to require it. + Application: &ApplicationCapabilities + V1_2: true + V1_1: false ################################################################################ # # CHANNEL @@ -62,29 +62,29 @@ Capabilities: # ################################################################################ Channel: &ChannelDefaults - # Policies defines the set of policies at this level of the config tree - # For Channel policies, their canonical path is - # /Channel/ - Policies: - # Who may invoke the 'Deliver' API - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - # Who may invoke the 'Broadcast' API - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - # By default, who may modify elements at this config level - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - - - # Capabilities describes the channel level capabilities, see the - # dedicated Capabilities section elsewhere in this file for a full - # description - Capabilities: - <<: *ChannelCapabilities + # Policies defines the set of policies at this level of the config tree + # For Channel policies, their canonical path is + # /Channel/ + Policies: + # Who may invoke the 'Deliver' API + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + # Who may invoke the 'Broadcast' API + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + # By default, who may modify elements at this config level + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + + + # Capabilities describes the channel level capabilities, see the + # dedicated Capabilities section elsewhere in this file for a full + # description + Capabilities: + <<: *ChannelCapabilities ################################################################################ @@ -97,59 +97,59 @@ Channel: &ChannelDefaults ################################################################################ Orderer: &OrdererDefaults - # Orderer Type: The orderer implementation to start - # Available types are "solo" and "kafka" - OrdererType: solo - - Addresses: - - orderer.example.com:7050 - - # Batch Timeout: The amount of time to wait before creating a batch - BatchTimeout: 0.5s - - # Batch Size: Controls the number of messages batched into a block - BatchSize: - - # Max Message Count: The maximum number of messages to permit in a batch - MaxMessageCount: 10 - - # Absolute Max Bytes: The absolute maximum number of bytes allowed for - # the serialized messages in a batch. - AbsoluteMaxBytes: 98 MB - - # Preferred Max Bytes: The preferred maximum number of bytes allowed for - # the serialized messages in a batch. A message larger than the preferred - # max bytes will result in a batch larger than preferred max bytes. - PreferredMaxBytes: 512 KB - - Kafka: - # Brokers: A list of Kafka brokers to which the orderer connects - # NOTE: Use IP:port notation - Brokers: - - 127.0.0.1:9092 - - # Organizations is the list of orgs which are defined as participants on - # the orderer side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Orderer policies, their canonical path is - # /Channel/Orderer/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - # BlockValidation specifies what signatures must be included in the block - # from the orderer for the peer to validate it. - BlockValidation: - Type: ImplicitMeta - Rule: "ANY Writers" + # Orderer Type: The orderer implementation to start + # Available types are "solo" and "kafka" + OrdererType: solo + + Addresses: + - orderer.example.com:7050 + + # Batch Timeout: The amount of time to wait before creating a batch + BatchTimeout: 0.5s + + # Batch Size: Controls the number of messages batched into a block + BatchSize: + + # Max Message Count: The maximum number of messages to permit in a batch + MaxMessageCount: 10 + + # Absolute Max Bytes: The absolute maximum number of bytes allowed for + # the serialized messages in a batch. + AbsoluteMaxBytes: 98 MB + + # Preferred Max Bytes: The preferred maximum number of bytes allowed for + # the serialized messages in a batch. A message larger than the preferred + # max bytes will result in a batch larger than preferred max bytes. + PreferredMaxBytes: 512 KB + + Kafka: + # Brokers: A list of Kafka brokers to which the orderer connects + # NOTE: Use IP:port notation + Brokers: + - 127.0.0.1:9092 + + # Organizations is the list of orgs which are defined as participants on + # the orderer side of the network + Organizations: + + # Policies defines the set of policies at this level of the config tree + # For Orderer policies, their canonical path is + # /Channel/Orderer/ + Policies: + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + # BlockValidation specifies what signatures must be included in the block + # from the orderer for the peer to validate it. + BlockValidation: + Type: ImplicitMeta + Rule: "ANY Writers" ################################################################################ # @@ -161,98 +161,98 @@ Orderer: &OrdererDefaults ################################################################################ Organizations: - # OrdererOrg defines an MSP using the sampleconfig. It should never be used - # in production but may be used as a template for other definitions - - &OrdererOrg - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: OrdererMSP - - # ID to load the MSP definition as - ID: OrdererMSP - - # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: ../crypto-config/ordererOrganizations/example.com/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: &OrdererOrgPolicies - Readers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.peer', 'OrdererMSP.client')" - Writers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.client')" - Admins: - Type: Signature - Rule: "OR('OrdererMSP.admin')" - - - &Org1 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org1MSP - - # ID to load the MSP definition as - ID: Org1MSP - - MSPDir: ../crypto-config/peerOrganizations/org1.example.com/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: &Org1Policies - Readers: - Type: Signature - Rule: "OR('Org1MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org1MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org1MSP.admin')" - - - &Org2 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org2MSP - - # ID to load the MSP definition as - ID: Org2MSP - - MSPDir: ../crypto-config/peerOrganizations/org2.example.com/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: &Org2Policies - Readers: - Type: Signature - Rule: "OR('Org2MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org2MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org2MSP.admin')" + # OrdererOrg defines an MSP using the sampleconfig. It should never be used + # in production but may be used as a template for other definitions + - &OrdererOrg + # DefaultOrg defines the organization which is used in the sampleconfig + # of the fabric.git development environment + Name: OrdererMSP + + # ID to load the MSP definition as + ID: OrdererMSP + + # MSPDir is the filesystem path which contains the MSP configuration + MSPDir: ../crypto-config/ordererOrganizations/example.com/msp + + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: &OrdererOrgPolicies + Readers: + Type: Signature + Rule: "OR('OrdererMSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.peer', 'OrdererMSP.client')" + Writers: + Type: Signature + Rule: "OR('OrdererMSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.client')" + Admins: + Type: Signature + Rule: "OR('OrdererMSP.admin')" + + - &Org1 + # DefaultOrg defines the organization which is used in the sampleconfig + # of the fabric.git development environment + Name: Org1MSP + + # ID to load the MSP definition as + ID: Org1MSP + + MSPDir: ../crypto-config/peerOrganizations/org1.example.com/msp + + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: &Org1Policies + Readers: + Type: Signature + Rule: "OR('Org1MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" + Writers: + Type: Signature + Rule: "OR('Org1MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" + Admins: + Type: Signature + Rule: "OR('Org1MSP.admin')" + + - &Org2 + # DefaultOrg defines the organization which is used in the sampleconfig + # of the fabric.git development environment + Name: Org2MSP + + # ID to load the MSP definition as + ID: Org2MSP + + MSPDir: ../crypto-config/peerOrganizations/org2.example.com/msp + + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: &Org2Policies + Readers: + Type: Signature + Rule: "OR('Org2MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" + Writers: + Type: Signature + Rule: "OR('Org2MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" + Admins: + Type: Signature + Rule: "OR('Org2MSP.admin')" ################################################################################ # @@ -264,26 +264,26 @@ Organizations: ################################################################################ Profiles: - TwoOrgsOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - - *Org2 - TwoOrgsChannel: - <<: *ChannelDefaults - Consortium: SampleConsortium - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - - *Org2 - Capabilities: - <<: *ApplicationCapabilities + TwoOrgsOrdererGenesis: + <<: *ChannelDefaults + Orderer: + <<: *OrdererDefaults + Organizations: + - *OrdererOrg + Capabilities: + <<: *OrdererCapabilities + Consortiums: + SampleConsortium: + Organizations: + - *Org1 + - *Org2 + TwoOrgsChannel: + <<: *ChannelDefaults + Consortium: SampleConsortium + Application: + <<: *ApplicationDefaults + Organizations: + - *Org1 + - *Org2 + Capabilities: + <<: *ApplicationCapabilities diff --git a/test/fixtures/crypto-material/config-base/generate.sh b/test/fixtures/crypto-material/config-base/generate.sh index b684f221af..82426e99d6 100755 --- a/test/fixtures/crypto-material/config-base/generate.sh +++ b/test/fixtures/crypto-material/config-base/generate.sh @@ -1,26 +1,36 @@ +#!/bin/bash # # SPDX-License-Identifier: Apache-2.0 # -echo 'Deleting old *.tx items....' -rm -rf ../crypto-config -rm -rf ../channel-config -mkdir ../channel-config +# Set the path to teh crypto material to ensure it may be used +CRYPTOGEN=$1 +export PATH=${PATH}:${CRYPTOGEN} + +# Get current location to ensure things go to the correct place +BASEDIR=$(dirname $(realpath $0)) + +# Start generating +echo "Creating new crypto material and tx blocks from within directory ${BASEDIR}" +rm -rf ${BASEDIR}/../crypto-config +rm -rf ${BASEDIR}/../channel-config +mkdir ${BASEDIR}/../crypto-config +mkdir ${BASEDIR}/../channel-config echo 'Generating base crypto-material and channel tx files....' -export FABRIC_CFG_PATH=$PWD -cryptogen generate --config=./crypto-config.yaml --output=../crypto-config -configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ./twoorgs.genesis.block -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychannel.tx -channelID mychannel -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychannel2.tx -channelID mychannel2 #test/integration/network-config.js -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychanneltx.tx -channelID mychanneltx #test/integration/create-configtx-channel.js -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychannelts.tx -channelID mychannelts #test/typescript -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/adminconfig.tx -channelID adminconfig #test/only-admin.js -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/discovery.tx -channelID discovery #test/integration/discovery.js +export FABRIC_CFG_PATH=${BASEDIR} +cryptogen generate --config=${BASEDIR}/crypto-config.yaml --output=${BASEDIR}/../crypto-config +configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ${BASEDIR}/twoorgs.genesis.block +configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ${BASEDIR}/../channel-config/mychannel.tx -channelID mychannel +configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ${BASEDIR}/../channel-config/mychannel2.tx -channelID mychannel2 #test/integration/network-config.js +configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ${BASEDIR}/../channel-config/mychanneltx.tx -channelID mychanneltx #test/integration/create-configtx-channel.js +configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ${BASEDIR}/../channel-config/mychannelts.tx -channelID mychannelts #test/typescript +configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ${BASEDIR}/../channel-config/adminconfig.tx -channelID adminconfig #test/only-admin.js +configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ${BASEDIR}/../channel-config/discovery.tx -channelID discovery #test/integration/discovery.js echo 'Generating crypto-material complete, now renaming keys...' # Rename the key files we use to be key.pem instead of a uuid -for KEY in $(find ../crypto-config -type f -name "*_sk"); do +for KEY in $(find ${BASEDIR}/../crypto-config -type f -name "*_sk"); do KEY_DIR=$(dirname ${KEY}) mv ${KEY} ${KEY_DIR}/key.pem done diff --git a/test/fixtures/crypto-material/config-base/twoorgs.genesis.block b/test/fixtures/crypto-material/config-base/twoorgs.genesis.block deleted file mode 100644 index a909dec6fb..0000000000 Binary files a/test/fixtures/crypto-material/config-base/twoorgs.genesis.block and /dev/null differ diff --git a/test/fixtures/crypto-material/config-update/configtx.yaml b/test/fixtures/crypto-material/config-update/configtx.yaml index 2a8784b7c4..a29a3b9a33 100644 --- a/test/fixtures/crypto-material/config-update/configtx.yaml +++ b/test/fixtures/crypto-material/config-update/configtx.yaml @@ -14,45 +14,45 @@ ################################################################################ Application: &ApplicationDefaults - # Organizations is the list of orgs which are defined as participants on - # the application side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Application policies, their canonical path is - # /Channel/Application/ - Policies: &ApplicationDefaultPolicies - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" + # Organizations is the list of orgs which are defined as participants on + # the application side of the network + Organizations: + + # Policies defines the set of policies at this level of the config tree + # For Application policies, their canonical path is + # /Channel/Application/ + Policies: &ApplicationDefaultPolicies + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" ################################################################################ # # SECTION: Capabilities ################################################################################ Capabilities: - # Channel capabilities apply to both the orderers and the peers and must be - # supported by both. Set the value of the capability to true to require it. - Channel: &ChannelCapabilities - V1_1: true - - # Orderer capabilities apply only to the orderers, and may be safely - # manipulated without concern for upgrading peers. Set the value of the - # capability to true to require it. - Orderer: &OrdererCapabilities - V1_1: true - - # Application capabilities apply only to the peer network, and may be - # safely manipulated without concern for upgrading orderers. Set the value - # of the capability to true to require it. - Application: &ApplicationCapabilities - V1_2: true - V1_1: false + # Channel capabilities apply to both the orderers and the peers and must be + # supported by both. Set the value of the capability to true to require it. + Channel: &ChannelCapabilities + V1_1: true + + # Orderer capabilities apply only to the orderers, and may be safely + # manipulated without concern for upgrading peers. Set the value of the + # capability to true to require it. + Orderer: &OrdererCapabilities + V1_1: true + + # Application capabilities apply only to the peer network, and may be + # safely manipulated without concern for upgrading orderers. Set the value + # of the capability to true to require it. + Application: &ApplicationCapabilities + V1_2: true + V1_1: false ################################################################################ # # CHANNEL @@ -62,29 +62,29 @@ Capabilities: # ################################################################################ Channel: &ChannelDefaults - # Policies defines the set of policies at this level of the config tree - # For Channel policies, their canonical path is - # /Channel/ - Policies: - # Who may invoke the 'Deliver' API - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - # Who may invoke the 'Broadcast' API - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - # By default, who may modify elements at this config level - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - - - # Capabilities describes the channel level capabilities, see the - # dedicated Capabilities section elsewhere in this file for a full - # description - Capabilities: - <<: *ChannelCapabilities + # Policies defines the set of policies at this level of the config tree + # For Channel policies, their canonical path is + # /Channel/ + Policies: + # Who may invoke the 'Deliver' API + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + # Who may invoke the 'Broadcast' API + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + # By default, who may modify elements at this config level + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + + + # Capabilities describes the channel level capabilities, see the + # dedicated Capabilities section elsewhere in this file for a full + # description + Capabilities: + <<: *ChannelCapabilities ################################################################################ @@ -97,59 +97,59 @@ Channel: &ChannelDefaults ################################################################################ Orderer: &OrdererDefaults - # Orderer Type: The orderer implementation to start - # Available types are "solo" and "kafka" - OrdererType: solo - - Addresses: - - orderer.example.com:7050 - - # Batch Timeout: The amount of time to wait before creating a batch - BatchTimeout: 0.5s - - # Batch Size: Controls the number of messages batched into a block - BatchSize: - - # Max Message Count: The maximum number of messages to permit in a batch - MaxMessageCount: 10 - - # Absolute Max Bytes: The absolute maximum number of bytes allowed for - # the serialized messages in a batch. - AbsoluteMaxBytes: 98 MB - - # Preferred Max Bytes: The preferred maximum number of bytes allowed for - # the serialized messages in a batch. A message larger than the preferred - # max bytes will result in a batch larger than preferred max bytes. - PreferredMaxBytes: 512 KB - - Kafka: - # Brokers: A list of Kafka brokers to which the orderer connects - # NOTE: Use IP:port notation - Brokers: - - 127.0.0.1:9092 - - # Organizations is the list of orgs which are defined as participants on - # the orderer side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Orderer policies, their canonical path is - # /Channel/Orderer/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - # BlockValidation specifies what signatures must be included in the block - # from the orderer for the peer to validate it. - BlockValidation: - Type: ImplicitMeta - Rule: "ANY Writers" + # Orderer Type: The orderer implementation to start + # Available types are "solo" and "kafka" + OrdererType: solo + + Addresses: + - orderer.example.com:7050 + + # Batch Timeout: The amount of time to wait before creating a batch + BatchTimeout: 0.5s + + # Batch Size: Controls the number of messages batched into a block + BatchSize: + + # Max Message Count: The maximum number of messages to permit in a batch + MaxMessageCount: 10 + + # Absolute Max Bytes: The absolute maximum number of bytes allowed for + # the serialized messages in a batch. + AbsoluteMaxBytes: 98 MB + + # Preferred Max Bytes: The preferred maximum number of bytes allowed for + # the serialized messages in a batch. A message larger than the preferred + # max bytes will result in a batch larger than preferred max bytes. + PreferredMaxBytes: 512 KB + + Kafka: + # Brokers: A list of Kafka brokers to which the orderer connects + # NOTE: Use IP:port notation + Brokers: + - 127.0.0.1:9092 + + # Organizations is the list of orgs which are defined as participants on + # the orderer side of the network + Organizations: + + # Policies defines the set of policies at this level of the config tree + # For Orderer policies, their canonical path is + # /Channel/Orderer/ + Policies: + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + # BlockValidation specifies what signatures must be included in the block + # from the orderer for the peer to validate it. + BlockValidation: + Type: ImplicitMeta + Rule: "ANY Writers" ################################################################################ # @@ -161,112 +161,112 @@ Orderer: &OrdererDefaults ################################################################################ Organizations: - # OrdererOrg defines an MSP using the sampleconfig. It should never be used - # in production but may be used as a template for other definitions - - &OrdererOrg - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: OrdererMSP - - # ID to load the MSP definition as - ID: OrdererMSP - - # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: ../crypto-config/ordererOrganizations/example.com/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: &OrdererOrgPolicies - Readers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.peer', 'OrdererMSP.client')" - Writers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.client')" - Admins: - Type: Signature - Rule: "OR('OrdererMSP.admin')" - - - &Org1 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org1MSP - - # ID to load the MSP definition as - ID: Org1MSP - - MSPDir: ../crypto-config/peerOrganizations/org1.example.com/msp - - AnchorPeers: - # 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.org1.example.com - Port: 7051 - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: &Org1Policies - Readers: - Type: Signature - Rule: "OR('Org1MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org1MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org1MSP.admin')" - - - &Org2 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org2MSP - - # ID to load the MSP definition as - ID: Org2MSP - - MSPDir: ../crypto-config/peerOrganizations/org2.example.com/msp - - AnchorPeers: - # 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.org2.example.com - Port: 8051 - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: &Org2Policies - Readers: - Type: Signature - Rule: "OR('Org2MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org2MSP.member')" - # If your MSP is configured with the new NodeOUs, you might - # want to use a more specific rule like the following: - # Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org2MSP.admin')" + # OrdererOrg defines an MSP using the sampleconfig. It should never be used + # in production but may be used as a template for other definitions + - &OrdererOrg + # DefaultOrg defines the organization which is used in the sampleconfig + # of the fabric.git development environment + Name: OrdererMSP + + # ID to load the MSP definition as + ID: OrdererMSP + + # MSPDir is the filesystem path which contains the MSP configuration + MSPDir: ../crypto-config/ordererOrganizations/example.com/msp + + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: &OrdererOrgPolicies + Readers: + Type: Signature + Rule: "OR('OrdererMSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.peer', 'OrdererMSP.client')" + Writers: + Type: Signature + Rule: "OR('OrdererMSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('OrdererMSP.admin', 'OrdererMSP.client')" + Admins: + Type: Signature + Rule: "OR('OrdererMSP.admin')" + + - &Org1 + # DefaultOrg defines the organization which is used in the sampleconfig + # of the fabric.git development environment + Name: Org1MSP + + # ID to load the MSP definition as + ID: Org1MSP + + MSPDir: ../crypto-config/peerOrganizations/org1.example.com/msp + + AnchorPeers: + # 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.org1.example.com + Port: 7051 + + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: &Org1Policies + Readers: + Type: Signature + Rule: "OR('Org1MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" + Writers: + Type: Signature + Rule: "OR('Org1MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" + Admins: + Type: Signature + Rule: "OR('Org1MSP.admin')" + + - &Org2 + # DefaultOrg defines the organization which is used in the sampleconfig + # of the fabric.git development environment + Name: Org2MSP + + # ID to load the MSP definition as + ID: Org2MSP + + MSPDir: ../crypto-config/peerOrganizations/org2.example.com/msp + + AnchorPeers: + # 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.org2.example.com + Port: 8051 + + # Policies defines the set of policies at this level of the config tree + # For organization policies, their canonical path is usually + # /Channel/// + Policies: &Org2Policies + Readers: + Type: Signature + Rule: "OR('Org2MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" + Writers: + Type: Signature + Rule: "OR('Org2MSP.member')" + # If your MSP is configured with the new NodeOUs, you might + # want to use a more specific rule like the following: + # Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" + Admins: + Type: Signature + Rule: "OR('Org2MSP.admin')" ################################################################################ # @@ -278,26 +278,26 @@ Organizations: ################################################################################ Profiles: - TwoOrgsOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - - *Org2 - TwoOrgsChannel: - <<: *ChannelDefaults - Consortium: SampleConsortium - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - - *Org2 - Capabilities: - <<: *ApplicationCapabilities + TwoOrgsOrdererGenesis: + <<: *ChannelDefaults + Orderer: + <<: *OrdererDefaults + Organizations: + - *OrdererOrg + Capabilities: + <<: *OrdererCapabilities + Consortiums: + SampleConsortium: + Organizations: + - *Org1 + - *Org2 + TwoOrgsChannel: + <<: *ChannelDefaults + Consortium: SampleConsortium + Application: + <<: *ApplicationDefaults + Organizations: + - *Org1 + - *Org2 + Capabilities: + <<: *ApplicationCapabilities diff --git a/test/fixtures/crypto-material/config-update/generate.sh b/test/fixtures/crypto-material/config-update/generate.sh index 2a8a7af217..8b05ddce7c 100755 --- a/test/fixtures/crypto-material/config-update/generate.sh +++ b/test/fixtures/crypto-material/config-update/generate.sh @@ -1,9 +1,18 @@ +#!/bin/bash # # SPDX-License-Identifier: Apache-2.0 # -echo 'Generating new channel update tx....' -export FABRIC_CFG_PATH=$PWD -configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ../channel-config/mychannel-org1anchor.tx -channelID mychannel -asOrg Org1MSP -configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ../channel-config/discovery_anchor.tx -channelID discovery -asOrg Org1MSP +# Set the path to teh crypto material to ensure it may be used +CRYPTOGEN=$1 +export PATH=${PATH}:${CRYPTOGEN} + +# Get current location to ensure things go to the correct place +BASEDIR=$(dirname $(realpath $0)) + +echo +echo "Creating new channel update tx blocks from within directory ${BASEDIR}" +export FABRIC_CFG_PATH=$BASEDIR +configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ${BASEDIR}/../channel-config/mychannel-org1anchor.tx -channelID mychannel -asOrg Org1MSP +configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ${BASEDIR}/../channel-config/discovery_anchor.tx -channelID discovery -asOrg Org1MSP diff --git a/test/fixtures/crypto-material/channel-config/v2/configtx.yaml b/test/fixtures/crypto-material/config-v2/configtx.yaml similarity index 100% rename from test/fixtures/crypto-material/channel-config/v2/configtx.yaml rename to test/fixtures/crypto-material/config-v2/configtx.yaml diff --git a/test/fixtures/crypto-material/channel-config/v2/tokenchannel.tx b/test/fixtures/crypto-material/config-v2/tokenchannel.tx similarity index 100% rename from test/fixtures/crypto-material/channel-config/v2/tokenchannel.tx rename to test/fixtures/crypto-material/config-v2/tokenchannel.tx diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem deleted file mode 100644 index b032b0054c..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQcFSnlNY2oK7NcfgZIzkezjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE2VsyoHNXyt0/ZtcDsIQIaurhS3 -4fSqJM0N3qJQg7IjxKMzSLwOS3z1xhmoSyEk41QKgSQKaOg7JNuRtXM/CcCjbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgUG0dfihR8AA/7PXwbfgs3C5JxAO1 -bG44CIHsioqckFMwCgYIKoZIzj0EAwIDSAAwRQIhALQJrlzr6WX11qwypIKlJkt4 -4NUe+8sw4cZwxCJcemGSAiBH1bbRu7/DhFDcydupkK1EnpD0NRrgivcoFvfXUxt/ -9A== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/key.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/key.pem deleted file mode 100644 index 48c14222a0..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg6XRF4Nf1Pusp8to/ -LxOAhea3utl3Lq1M3LOwUs7ATcmhRANCAARNlbMqBzV8rdP2bXA7CECGrq4Ut+H0 -qiTNDd6iUIOyI8SjM0i8Dkt89cYZqEshJONUCoEkCmjoOyTbkbVzPwnA ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index 0ca031fcdb..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQdgd2qYlg8HmBHriLJBTj+TAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEEG9ayym4vO3oPqrWkMyc1h8PFuE1YxTlvQFP6GO2nCBzy/uDj5Y+ -n7/eQ593DnYVz8X+E0htIR+TapgUxXJZvaNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgUG0dfihR8AA/7PXwbfgs3C5JxAO1bG44 -CIHsioqckFMwCgYIKoZIzj0EAwIDRwAwRAIgaukN8gNFKvexrJ5aSL8Gn4clXso/ -fwKlaJ0mZzF2Vv8CIF9IwhBkrWXtfBTtduvXAV7RijJiwNeHVqj+qdq8xa3V ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index b032b0054c..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQcFSnlNY2oK7NcfgZIzkezjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE2VsyoHNXyt0/ZtcDsIQIaurhS3 -4fSqJM0N3qJQg7IjxKMzSLwOS3z1xhmoSyEk41QKgSQKaOg7JNuRtXM/CcCjbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgUG0dfihR8AA/7PXwbfgs3C5JxAO1 -bG44CIHsioqckFMwCgYIKoZIzj0EAwIDSAAwRQIhALQJrlzr6WX11qwypIKlJkt4 -4NUe+8sw4cZwxCJcemGSAiBH1bbRu7/DhFDcydupkK1EnpD0NRrgivcoFvfXUxt/ -9A== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index 9c9c7597ec..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQzCCAeqgAwIBAgIRAKy7gnhjGS2UTdf8uzqI1oMwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS71OoQKYmN7x69iDOH -BaJcOHjqFS9WsprP5g9g1Vb5a3V+SQfLHrW3955Y5KVDvlbrpydYbLNUcFJ90l/q -1Q1fo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIFit/xrI7NZHgn+oDgEs -0N9uYx4mMSBaXIgGI+lpYDuEMAoGCCqGSM49BAMCA0cAMEQCIEql+7KeqFMxb+o5 -HxLQoVCwkKcc1IHp323KVnjzwikXAiAj82hkZzlfatpivn0n4XgIz2Aa5xJpN7cS -G+glNR5ZZg== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index 0ca031fcdb..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQdgd2qYlg8HmBHriLJBTj+TAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEEG9ayym4vO3oPqrWkMyc1h8PFuE1YxTlvQFP6GO2nCBzy/uDj5Y+ -n7/eQ593DnYVz8X+E0htIR+TapgUxXJZvaNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgUG0dfihR8AA/7PXwbfgs3C5JxAO1bG44 -CIHsioqckFMwCgYIKoZIzj0EAwIDRwAwRAIgaukN8gNFKvexrJ5aSL8Gn4clXso/ -fwKlaJ0mZzF2Vv8CIF9IwhBkrWXtfBTtduvXAV7RijJiwNeHVqj+qdq8xa3V ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index b032b0054c..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQcFSnlNY2oK7NcfgZIzkezjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE2VsyoHNXyt0/ZtcDsIQIaurhS3 -4fSqJM0N3qJQg7IjxKMzSLwOS3z1xhmoSyEk41QKgSQKaOg7JNuRtXM/CcCjbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgUG0dfihR8AA/7PXwbfgs3C5JxAO1 -bG44CIHsioqckFMwCgYIKoZIzj0EAwIDSAAwRQIhALQJrlzr6WX11qwypIKlJkt4 -4NUe+8sw4cZwxCJcemGSAiBH1bbRu7/DhFDcydupkK1EnpD0NRrgivcoFvfXUxt/ -9A== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem deleted file mode 100644 index 9ccd57cd7d..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgI37YP+8+CmzSjvL2 -V0b607ae+lKNl8T8Y8OBsusBB22hRANCAAQRGNb+v+ZLj0TdTk3At8hwGaQ3tN8C -y4IIDNdgBxuvOnE0uTBS4mPsBHpNNjPguwS+Udh1TBJMlftZsaJKcJoq ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem deleted file mode 100644 index ed2a611fe5..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbKgAwIBAgIQd6gEY72bF6vqMSdc7bmu2TAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowWDELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggq -hkjOPQMBBwNCAAQRGNb+v+ZLj0TdTk3At8hwGaQ3tN8Cy4IIDNdgBxuvOnE0uTBS -4mPsBHpNNjPguwS+Udh1TBJMlftZsaJKcJoqo00wSzAOBgNVHQ8BAf8EBAMCB4Aw -DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCBQbR1+KFHwAD/s9fBt+CzcLknEA7Vs -bjgIgeyKipyQUzAKBggqhkjOPQQDAgNHADBEAiAchO2Ury31jchorpN1F81VL0i+ -TrtbWsapJLFNcN0RCwIgPmxMSAOavh8lYv+I8Rk3XkzjZpfIDLSPTNnvgZXexeY= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index 9c9c7597ec..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQzCCAeqgAwIBAgIRAKy7gnhjGS2UTdf8uzqI1oMwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS71OoQKYmN7x69iDOH -BaJcOHjqFS9WsprP5g9g1Vb5a3V+SQfLHrW3955Y5KVDvlbrpydYbLNUcFJ90l/q -1Q1fo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIFit/xrI7NZHgn+oDgEs -0N9uYx4mMSBaXIgGI+lpYDuEMAoGCCqGSM49BAMCA0cAMEQCIEql+7KeqFMxb+o5 -HxLQoVCwkKcc1IHp323KVnjzwikXAiAj82hkZzlfatpivn0n4XgIz2Aa5xJpN7cS -G+glNR5ZZg== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt deleted file mode 100644 index 9c9c7597ec..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQzCCAeqgAwIBAgIRAKy7gnhjGS2UTdf8uzqI1oMwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS71OoQKYmN7x69iDOH -BaJcOHjqFS9WsprP5g9g1Vb5a3V+SQfLHrW3955Y5KVDvlbrpydYbLNUcFJ90l/q -1Q1fo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIFit/xrI7NZHgn+oDgEs -0N9uYx4mMSBaXIgGI+lpYDuEMAoGCCqGSM49BAMCA0cAMEQCIEql+7KeqFMxb+o5 -HxLQoVCwkKcc1IHp323KVnjzwikXAiAj82hkZzlfatpivn0n4XgIz2Aa5xJpN7cS -G+glNR5ZZg== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt deleted file mode 100644 index fa97098086..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWjCCAgCgAwIBAgIRAJRBMGAFxEJjfyPSxNhm9h8wCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMFgxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0C -AQYIKoZIzj0DAQcDQgAECfreggAHo3kAtrVPsx6IM3bFOEtU/KSpBu3jqnHFUfVn -SYXpBKge799J6oZgpFYInFaga1wlgGOvvwG0XynumKOBljCBkzAOBgNVHQ8BAf8E -BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQC -MAAwKwYDVR0jBCQwIoAgWK3/Gsjs1keCf6gOASzQ325jHiYxIFpciAYj6WlgO4Qw -JwYDVR0RBCAwHoITb3JkZXJlci5leGFtcGxlLmNvbYIHb3JkZXJlcjAKBggqhkjO -PQQDAgNIADBFAiEAr5N8JWA+rT8gljQpwHWJos8NZan9W03qiXjYyrNFqIUCIDDb -JefKpWuHVjML//LxkRnoC8ZbUceFMkC8T350yi5l ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key deleted file mode 100644 index 65e2e76e33..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgr674LJjK0MEK8+c5 -x7MTzvIHwQhdgrY83dYLZ2BtfDWhRANCAAQJ+t6CAAejeQC2tU+zHogzdsU4S1T8 -pKkG7eOqccVR9WdJhekEqB7v30nqhmCkVgicVqBrXCWAY6+/AbRfKe6Y ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/key.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/key.pem deleted file mode 100644 index 93e068b293..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgIaBec66C7xi3Ro4v -/pRWGSWRJwwD0sII6DwDt9EaD8WhRANCAAS71OoQKYmN7x69iDOHBaJcOHjqFS9W -sprP5g9g1Vb5a3V+SQfLHrW3955Y5KVDvlbrpydYbLNUcFJ90l/q1Q1f ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem deleted file mode 100644 index 9c9c7597ec..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQzCCAeqgAwIBAgIRAKy7gnhjGS2UTdf8uzqI1oMwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS71OoQKYmN7x69iDOH -BaJcOHjqFS9WsprP5g9g1Vb5a3V+SQfLHrW3955Y5KVDvlbrpydYbLNUcFJ90l/q -1Q1fo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIFit/xrI7NZHgn+oDgEs -0N9uYx4mMSBaXIgGI+lpYDuEMAoGCCqGSM49BAMCA0cAMEQCIEql+7KeqFMxb+o5 -HxLQoVCwkKcc1IHp323KVnjzwikXAiAj82hkZzlfatpivn0n4XgIz2Aa5xJpN7cS -G+glNR5ZZg== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index 0ca031fcdb..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQdgd2qYlg8HmBHriLJBTj+TAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEEG9ayym4vO3oPqrWkMyc1h8PFuE1YxTlvQFP6GO2nCBzy/uDj5Y+ -n7/eQ593DnYVz8X+E0htIR+TapgUxXJZvaNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgUG0dfihR8AA/7PXwbfgs3C5JxAO1bG44 -CIHsioqckFMwCgYIKoZIzj0EAwIDRwAwRAIgaukN8gNFKvexrJ5aSL8Gn4clXso/ -fwKlaJ0mZzF2Vv8CIF9IwhBkrWXtfBTtduvXAV7RijJiwNeHVqj+qdq8xa3V ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index b032b0054c..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQcFSnlNY2oK7NcfgZIzkezjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE2VsyoHNXyt0/ZtcDsIQIaurhS3 -4fSqJM0N3qJQg7IjxKMzSLwOS3z1xhmoSyEk41QKgSQKaOg7JNuRtXM/CcCjbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgUG0dfihR8AA/7PXwbfgs3C5JxAO1 -bG44CIHsioqckFMwCgYIKoZIzj0EAwIDSAAwRQIhALQJrlzr6WX11qwypIKlJkt4 -4NUe+8sw4cZwxCJcemGSAiBH1bbRu7/DhFDcydupkK1EnpD0NRrgivcoFvfXUxt/ -9A== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem deleted file mode 100644 index f64710559d..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgrG+IpvU/p0/NkzSA -CxnV0GEfsBXSNWS6de5Pseb86P6hRANCAAQQb1rLKbi87eg+qtaQzJzWHw8W4TVj -FOW9AU/oY7acIHPL+4OPlj6fv95Dn3cOdhXPxf4TSG0hH5NqmBTFclm9 ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem deleted file mode 100644 index 0ca031fcdb..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCTCCAbCgAwIBAgIQdgd2qYlg8HmBHriLJBTj+TAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE5MDMwNDA5MzMwMFoXDTI5MDMwMTA5MzMwMFowVjELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAEEG9ayym4vO3oPqrWkMyc1h8PFuE1YxTlvQFP6GO2nCBzy/uDj5Y+ -n7/eQ593DnYVz8X+E0htIR+TapgUxXJZvaNNMEswDgYDVR0PAQH/BAQDAgeAMAwG -A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgUG0dfihR8AA/7PXwbfgs3C5JxAO1bG44 -CIHsioqckFMwCgYIKoZIzj0EAwIDRwAwRAIgaukN8gNFKvexrJ5aSL8Gn4clXso/ -fwKlaJ0mZzF2Vv8CIF9IwhBkrWXtfBTtduvXAV7RijJiwNeHVqj+qdq8xa3V ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index 9c9c7597ec..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQzCCAeqgAwIBAgIRAKy7gnhjGS2UTdf8uzqI1oMwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS71OoQKYmN7x69iDOH -BaJcOHjqFS9WsprP5g9g1Vb5a3V+SQfLHrW3955Y5KVDvlbrpydYbLNUcFJ90l/q -1Q1fo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIFit/xrI7NZHgn+oDgEs -0N9uYx4mMSBaXIgGI+lpYDuEMAoGCCqGSM49BAMCA0cAMEQCIEql+7KeqFMxb+o5 -HxLQoVCwkKcc1IHp323KVnjzwikXAiAj82hkZzlfatpivn0n4XgIz2Aa5xJpN7cS -G+glNR5ZZg== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt deleted file mode 100644 index 9c9c7597ec..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQzCCAeqgAwIBAgIRAKy7gnhjGS2UTdf8uzqI1oMwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS71OoQKYmN7x69iDOH -BaJcOHjqFS9WsprP5g9g1Vb5a3V+SQfLHrW3955Y5KVDvlbrpydYbLNUcFJ90l/q -1Q1fo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIFit/xrI7NZHgn+oDgEs -0N9uYx4mMSBaXIgGI+lpYDuEMAoGCCqGSM49BAMCA0cAMEQCIEql+7KeqFMxb+o5 -HxLQoVCwkKcc1IHp323KVnjzwikXAiAj82hkZzlfatpivn0n4XgIz2Aa5xJpN7cS -G+glNR5ZZg== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt deleted file mode 100644 index ee984f3549..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLTCCAdOgAwIBAgIRAJFmmtyxNqxXeguH5Qb23AkwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBaMFYxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABHRz1TpCYfiMlmLhXwjShavdxIWITujejLR2WISqALRwZT3J -U0hlyRoGrhvcdsDOQFiYCG2zgOic/nNQFZY8MhOjbDBqMA4GA1UdDwEB/wQEAwIF -oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAr -BgNVHSMEJDAigCBYrf8ayOzWR4J/qA4BLNDfbmMeJjEgWlyIBiPpaWA7hDAKBggq -hkjOPQQDAgNIADBFAiEAylA5+x1xpYYwUkuRBhOYJ8eG4ORVkgOxQD+uCg1Sr+EC -IEsLEBvOMHijcLed29t783fspASAb0hwmzTBM+wj2c2M ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key deleted file mode 100644 index 7f635fae30..0000000000 --- a/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgA92qD7XhmCd/bbgU -EHkOYnfKYytkyPtLh4FAjHyYp5ehRANCAAR0c9U6QmH4jJZi4V8I0oWr3cSFiE7o -3oy0dliEqgC0cGU9yVNIZckaBq4b3HbAzkBYmAhts4DonP5zUBWWPDIT ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem deleted file mode 100644 index 0c498af711..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUTCCAfigAwIBAgIRAMBxU6nJtDRmAOJl1dBLDZgwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE -AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BPCJ746gUhivO5RRdKUSCphCVXW7WJQCyC2Niqg0CnaN68Q6OEKYgjpoRf1xnucZ -Uu5oXMnGFy/xvK14eD4nXRSjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU -BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg -O6mGeDOMZeoWt1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRwAw -RAIgNuAYV7OuQnJEVWmL+oLgweQipgH1576qCijb77EVPmECICbCGKmXijw/1SXT -PMIAsoolPYCgNQVMXRZcitLPm5Jr ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/key.pem deleted file mode 100644 index ccbc1c4028..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZn/KjujuRVppUA3v -3BqkNsJV19IeIR5pc/xcq+VWqbOhRANCAATwie+OoFIYrzuUUXSlEgqYQlV1u1iU -AsgtjYqoNAp2jevEOjhCmII6aEX9cZ7nGVLuaFzJxhcv8byteHg+J10U ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 1369c434f2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAcCgAwIBAgIRAJYQqgsUOyJCUeE4vOZEkbAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABO8Fbo+ZDvQcJge7g5J2OuUKPn/Lj78J -J8AV8if0Fx6nreJUpM1wxJKyU+meDyQVFf8sKtyYQdzwOxWRf93PmVWjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIDuphngzjGXq -FrdabLPk4mUBX+m+fb+GQzc4/BjfnaAKMAoGCCqGSM49BAMCA0cAMEQCIGUlOvZi -eHC+Qx13ChubfB28K1fQaPhkqE7zhrHrpaO9AiApGfWgfjg7t36LJOoeSL5XbuZE -ZQzz05X0qe04/ssfzA== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 0c498af711..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUTCCAfigAwIBAgIRAMBxU6nJtDRmAOJl1dBLDZgwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE -AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BPCJ746gUhivO5RRdKUSCphCVXW7WJQCyC2Niqg0CnaN68Q6OEKYgjpoRf1xnucZ -Uu5oXMnGFy/xvK14eD4nXRSjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU -BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg -O6mGeDOMZeoWt1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRwAw -RAIgNuAYV7OuQnJEVWmL+oLgweQipgH1576qCijb77EVPmECICbCGKmXijw/1SXT -PMIAsoolPYCgNQVMXRZcitLPm5Jr ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 1369c434f2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAcCgAwIBAgIRAJYQqgsUOyJCUeE4vOZEkbAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABO8Fbo+ZDvQcJge7g5J2OuUKPn/Lj78J -J8AV8if0Fx6nreJUpM1wxJKyU+meDyQVFf8sKtyYQdzwOxWRf93PmVWjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIDuphngzjGXq -FrdabLPk4mUBX+m+fb+GQzc4/BjfnaAKMAoGCCqGSM49BAMCA0cAMEQCIGUlOvZi -eHC+Qx13ChubfB28K1fQaPhkqE7zhrHrpaO9AiApGfWgfjg7t36LJOoeSL5XbuZE -ZQzz05X0qe04/ssfzA== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 0c498af711..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUTCCAfigAwIBAgIRAMBxU6nJtDRmAOJl1dBLDZgwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE -AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BPCJ746gUhivO5RRdKUSCphCVXW7WJQCyC2Niqg0CnaN68Q6OEKYgjpoRf1xnucZ -Uu5oXMnGFy/xvK14eD4nXRSjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU -BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg -O6mGeDOMZeoWt1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRwAw -RAIgNuAYV7OuQnJEVWmL+oLgweQipgH1576qCijb77EVPmECICbCGKmXijw/1SXT -PMIAsoolPYCgNQVMXRZcitLPm5Jr ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem deleted file mode 100644 index 23ce0ca9ab..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQggyu51PSEpPqh2SKO -VFM877XpXwrF3WEO+EUyzyq/w4+hRANCAAQO4i3pQgHPLyph0IGuxERT9SC0FFaj -lG8CgCuBk9+BoUOMCvjFCqeVmHr0le5WTqTBZSOcn/FvKx7+B5CvrO3D ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem deleted file mode 100644 index 26e2b8d805..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQfUe2TT2EvOdjv9B8kl4F6jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDuIt6UIBzy8qYdCBrsREU/UgtBRWo5Rv -AoArgZPfgaFDjAr4xQqnlZh69JXuVk6kwWUjnJ/xbyse/geQr6ztw6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgO6mGeDOMZeoW -t1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDSAAwRQIhAPaWmaaL -ZtdamRDUeih9C0dajSGRdNuYOp6VUcgntd7AAiAnvmA0/1D15tZj2j19TZ1cdvLQ -XOoWBfWaWTMsW9Kkkw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt deleted file mode 100644 index 3648911195..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICZjCCAg2gAwIBAgIQHnL9HHu4SHPXqMTiEpcLhDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfS3s/rhcQnyStgfvi1avxOeqcZq2 -5EsIeAF08MUZLdPG/sukaOcXLpkhVstpv3swTGooUfqvsz3QDIrrZqJRm6OBlzCB -lDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7p -WFotmW3CZCQvwMYwKAYDVR0RBCEwH4IWcGVlcjAub3JnMS5leGFtcGxlLmNvbYIF -cGVlcjAwCgYIKoZIzj0EAwIDRwAwRAIgYNe3+UkGKrgrjZSe5H7rF7oDs1e9+vJu -dguBoV/yu60CIDwcV6ndYZfwPFthRTRxlWwf0ttY2N5l6GaIMU1hIw4e ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key deleted file mode 100644 index 0d467b5b5a..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgmm5YwmI0Y8KXbZFY -MkS9wKWlE8ubQ3g78KHDJgD7fCqhRANCAAR9Lez+uFxCfJK2B++LVq/E56pxmrbk -Swh4AXTwxRkt08b+y6Ro5xcumSFWy2m/ezBMaihR+q+zPdAMiutmolGb ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 1369c434f2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAcCgAwIBAgIRAJYQqgsUOyJCUeE4vOZEkbAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABO8Fbo+ZDvQcJge7g5J2OuUKPn/Lj78J -J8AV8if0Fx6nreJUpM1wxJKyU+meDyQVFf8sKtyYQdzwOxWRf93PmVWjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIDuphngzjGXq -FrdabLPk4mUBX+m+fb+GQzc4/BjfnaAKMAoGCCqGSM49BAMCA0cAMEQCIGUlOvZi -eHC+Qx13ChubfB28K1fQaPhkqE7zhrHrpaO9AiApGfWgfjg7t36LJOoeSL5XbuZE -ZQzz05X0qe04/ssfzA== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 0c498af711..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUTCCAfigAwIBAgIRAMBxU6nJtDRmAOJl1dBLDZgwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE -AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BPCJ746gUhivO5RRdKUSCphCVXW7WJQCyC2Niqg0CnaN68Q6OEKYgjpoRf1xnucZ -Uu5oXMnGFy/xvK14eD4nXRSjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU -BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg -O6mGeDOMZeoWt1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRwAw -RAIgNuAYV7OuQnJEVWmL+oLgweQipgH1576qCijb77EVPmECICbCGKmXijw/1SXT -PMIAsoolPYCgNQVMXRZcitLPm5Jr ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem deleted file mode 100644 index f2aa9dc685..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgGbQ7UwshEammvN0F -RleZNbJbhDY+kZKMublsJTfJ96yhRANCAASOEeq7DLsFqtl9j17xI5QWHvLWS39K -WUbbtrrlrTR29HAbVNZucxHdEpxAcfUL1sNEsUonDHE5TwgFVMjp6+6X ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem deleted file mode 100644 index f73b787385..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQVnPN4BS6a4rEPDiepf24ZTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMS5vcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEjhHquwy7BarZfY9e8SOUFh7y1kt/SllG -27a65a00dvRwG1TWbnMR3RKcQHH1C9bDRLFKJwxxOU8IBVTI6evul6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgO6mGeDOMZeoW -t1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDSAAwRQIhAOYrvaBk -Z3ObhDZsayhFzTXrdKrrSsqhUlnZU7aPRkgKAiB5YIDBGhEZhIg4BQKWmrPMw2l7 -tbDdxdKyywvUzOs0ZA== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt deleted file mode 100644 index c128cc05c2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICaDCCAg6gAwIBAgIRANZtbjgOkTWwvPqYp38IlnMwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKxle96I7YWH/ztCgU486jBzJwFH -2yaydSRNgSW60fIGe79k849+fTrh2v4tEdtAlQ+X6MpQcM1ySph2V4lNcj+jgZcw -gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIL6eGdFCsmdVavGDF96drzkSxGCe -6VhaLZltwmQkL8DGMCgGA1UdEQQhMB+CFnBlZXIxLm9yZzEuZXhhbXBsZS5jb22C -BXBlZXIxMAoGCCqGSM49BAMCA0gAMEUCIQC7QYqLDbPUZw/3b6kmMkTI3ebssWj+ -ukzic2/IbsklrgIgJJdXEaY3Q3yXIrSMbrYdG3/tHoaznCHGhZ19z1pd5M0= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key deleted file mode 100644 index 10cb13d911..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgsRD5CUXbRVrU25GW -ST5if4MWnBTTUfSCfR6To2BWHE6hRANCAASsZXveiO2Fh/87QoFOPOowcycBR9sm -snUkTYElutHyBnu/ZPOPfn064dr+LRHbQJUPl+jKUHDNckqYdleJTXI/ ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem deleted file mode 100644 index 0a60cd3082..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg1cBtG35FG5b/jhEF -k4wpLiVHkxryqNG6p7xTxXFQD02hRANCAATLBty155VQ8sFKbWtSzll6LpcDJlA/ -me09tnXvIYn9WsOZe8m2s18fn/YIIM+B9DRWw8EMJ/wLsHl3OgArcFBQ ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 1369c434f2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAcCgAwIBAgIRAJYQqgsUOyJCUeE4vOZEkbAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABO8Fbo+ZDvQcJge7g5J2OuUKPn/Lj78J -J8AV8if0Fx6nreJUpM1wxJKyU+meDyQVFf8sKtyYQdzwOxWRf93PmVWjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIDuphngzjGXq -FrdabLPk4mUBX+m+fb+GQzc4/BjfnaAKMAoGCCqGSM49BAMCA0cAMEQCIGUlOvZi -eHC+Qx13ChubfB28K1fQaPhkqE7zhrHrpaO9AiApGfWgfjg7t36LJOoeSL5XbuZE -ZQzz05X0qe04/ssfzA== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 0c498af711..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUTCCAfigAwIBAgIRAMBxU6nJtDRmAOJl1dBLDZgwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE -AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BPCJ746gUhivO5RRdKUSCphCVXW7WJQCyC2Niqg0CnaN68Q6OEKYgjpoRf1xnucZ -Uu5oXMnGFy/xvK14eD4nXRSjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU -BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg -O6mGeDOMZeoWt1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRwAw -RAIgNuAYV7OuQnJEVWmL+oLgweQipgH1576qCijb77EVPmECICbCGKmXijw/1SXT -PMIAsoolPYCgNQVMXRZcitLPm5Jr ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem deleted file mode 100644 index dcfcb9c335..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgBwTsEBVnp4iuOnku -Vfxg9v33IJlv3NxSVYuhCKAqf5ihRANCAATvBW6PmQ70HCYHu4OSdjrlCj5/y4+/ -CSfAFfIn9Bcep63iVKTNcMSSslPpng8kFRX/LCrcmEHc8DsVkX/dz5lV ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 1369c434f2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAcCgAwIBAgIRAJYQqgsUOyJCUeE4vOZEkbAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABO8Fbo+ZDvQcJge7g5J2OuUKPn/Lj78J -J8AV8if0Fx6nreJUpM1wxJKyU+meDyQVFf8sKtyYQdzwOxWRf93PmVWjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIDuphngzjGXq -FrdabLPk4mUBX+m+fb+GQzc4/BjfnaAKMAoGCCqGSM49BAMCA0cAMEQCIGUlOvZi -eHC+Qx13ChubfB28K1fQaPhkqE7zhrHrpaO9AiApGfWgfjg7t36LJOoeSL5XbuZE -ZQzz05X0qe04/ssfzA== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt deleted file mode 100644 index 599d0b1268..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeGgAwIBAgIQb/I+6C0gRmCK5Iia5MfNdjAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEov3QUqVtq/Qb3WVh+q6NK55c98n3 -6wMi5nr3RcpABYuyuYLGXreqeh9k8LEFhLugFQT+jVv/zvD6biD9e7KzzKNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIL6eGdFCsmdVavGDF96drzkSxGCe6Vha -LZltwmQkL8DGMAoGCCqGSM49BAMCA0gAMEUCIQD6cH+hH9+Vek93FPx5p+gGtZTY -AB6MxXEPgI4b8LZ70QIgfu0FG7uEygPCCdxa/U4RGRMXY5Q75gpFGDL6ws8s6MU= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key deleted file mode 100644 index c4af9043cd..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgFESt2DTXZ1ucuvmC -QTKAUNB14DBm6ykKXyBqi2vG1c6hRANCAASi/dBSpW2r9BvdZWH6ro0rnlz3yffr -AyLmevdFykAFi7K5gsZet6p6H2TwsQWEu6AVBP6NW//O8PpuIP17srPM ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 9f7003df34..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICFzCCAb+gAwIBAgIQew41f+vjaG4S91h16zHHsTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEW7Wn6hcpKjPeBjhvh/7mWUkNT8AFvEon -cwK+1dWyB/i5HhriDLYk5Kzl2dsEcEXEkkYK7ZgCmH1nTwnh3zQl6aNNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgO6mGeDOMZeoW -t1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRgAwQwIfME7gAt/n -/yQAYm+G+iCkGHyxCXlSxMsvHhFmvUYyFwIgAUqAtV/Lz4SxqI+KISFgJZgEyj5e -QMF1elzLrkvo3EM= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 0c498af711..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUTCCAfigAwIBAgIRAMBxU6nJtDRmAOJl1dBLDZgwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE -AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA -BPCJ746gUhivO5RRdKUSCphCVXW7WJQCyC2Niqg0CnaN68Q6OEKYgjpoRf1xnucZ -Uu5oXMnGFy/xvK14eD4nXRSjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU -BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg -O6mGeDOMZeoWt1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRwAw -RAIgNuAYV7OuQnJEVWmL+oLgweQipgH1576qCijb77EVPmECICbCGKmXijw/1SXT -PMIAsoolPYCgNQVMXRZcitLPm5Jr ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem deleted file mode 100644 index 268b82c833..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0BcpDWZN3uz4Wova -R59qnMY6SwH2+HVoB8ohFs0g512hRANCAARbtafqFykqM94GOG+H/uZZSQ1PwAW8 -SidzAr7V1bIH+LkeGuIMtiTkrOXZ2wRwRcSSRgrtmAKYfWdPCeHfNCXp ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 9f7003df34..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICFzCCAb+gAwIBAgIQew41f+vjaG4S91h16zHHsTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEW7Wn6hcpKjPeBjhvh/7mWUkNT8AFvEon -cwK+1dWyB/i5HhriDLYk5Kzl2dsEcEXEkkYK7ZgCmH1nTwnh3zQl6aNNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgO6mGeDOMZeoW -t1pss+TiZQFf6b59v4ZDNzj8GN+doAowCgYIKoZIzj0EAwIDRgAwQwIfME7gAt/n -/yQAYm+G+iCkGHyxCXlSxMsvHhFmvUYyFwIgAUqAtV/Lz4SxqI+KISFgJZgEyj5e -QMF1elzLrkvo3EM= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt deleted file mode 100644 index f4809573d3..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWDCCAf6gAwIBAgIRAI9kNiZ/DzTZk8tRWYCae3AwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABMsG3LXnlVDywUpta1LOWXoulwMmUD+Z7T22de8hif1aw5l7ybazXx+f -9gggz4H0NFbDwQwn/AuweXc6ACtwUFCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV -HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV -HQ4EIgQgvp4Z0UKyZ1Vq8YMX3p2vORLEYJ7pWFotmW3CZCQvwMYwCgYIKoZIzj0E -AwIDSAAwRQIhAPD1YfwTJbQtKP/WRma/nNyruyjptHDWlXAJ04WW1OLgAiBCb3eL -lhWm/HPV84D94Pt3Puv6046pR0hnRaGSKWhvZw== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt deleted file mode 100644 index a9d60a7ad6..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeGgAwIBAgIQJw+WiGKRep+PXrqNLleRjTAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEi1HqWSq7PRySIG+ZTYOtXAC6Q34k -ED6s7WGT8zbi+bopN3FJpQB1w3Yf9WgKLlpAPVRNNQp4wsArceKKNXRTm6NsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIL6eGdFCsmdVavGDF96drzkSxGCe6Vha -LZltwmQkL8DGMAoGCCqGSM49BAMCA0gAMEUCIQCMAZ6hqSz95Q9B+KjkSKU2vdDK -RhxXxvSLmN//pFf/4gIgELtuH7JFkEQKXwyICUJFh0HR0CsWpRLvCowanm8qKX8= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key deleted file mode 100644 index 58fbf130e4..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgKJ06oPQmsQwmREnm -oLq/7F42lNLMdx7Pu76Kwnrro7qhRANCAASLUepZKrs9HJIgb5lNg61cALpDfiQQ -PqztYZPzNuL5uik3cUmlAHXDdh/1aAouWkA9VE01CnjCwCtx4oo1dFOb ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem deleted file mode 100644 index 13677f75ad..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQC036iJWK1K0Vm/dLyDlgqTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -DCDFaU9rmdwI7uaMIY2ZWktaAEe5t0GXPit9FkSDwIy8CaKwNSjz3zTB53cKAR66 -8fJGzbuW/ByznDAODW41QqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCDI -YLioCTg6UQSUG6L++bBwfTSwoTBKqTae9+YGEWnfCDAKBggqhkjOPQQDAgNHADBE -AiASBO7X1hIYUS0clN+ZhPAXhGXB4LdlyRvLu58cZHzAbgIgaT+a/rBJ0NA9Xcrm -62XlCTduLq8/YG4MW2rj/5/WJuw= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/key.pem deleted file mode 100644 index db0bc7b596..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg5CjaX7L+DCf4YPhd -oCrxTi9PELNmrgJkevM3aYiLKjahRANCAAQMIMVpT2uZ3Aju5owhjZlaS1oAR7m3 -QZc+K30WRIPAjLwJorA1KPPfNMHndwoBHrrx8kbNu5b8HLOcMA4NbjVC ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 600514d0c2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAOpcBOwg644Spvv1VN9vhzAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMi5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABK/slVNeN0WNpvltBiE7xnwdaivZdkHt -7u60Ic42P6tdyk8TKFCUIbmfzhfxZjSOW7zDVA9bWjINqOZbEAr8otKjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMhguKgJODpR -BJQbov75sHB9NLChMEqpNp735gYRad8IMAoGCCqGSM49BAMCA0gAMEUCIQCic1Mz -SJK54EE+RUPCON3WDetRq9R2HZ4AgCs1z+jJDwIgYeP5Bj8NeuPI2jO8/mtPbB4N -yyXkX1mPhsIx+a1JibM= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 13677f75ad..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQC036iJWK1K0Vm/dLyDlgqTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -DCDFaU9rmdwI7uaMIY2ZWktaAEe5t0GXPit9FkSDwIy8CaKwNSjz3zTB53cKAR66 -8fJGzbuW/ByznDAODW41QqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCDI -YLioCTg6UQSUG6L++bBwfTSwoTBKqTae9+YGEWnfCDAKBggqhkjOPQQDAgNHADBE -AiASBO7X1hIYUS0clN+ZhPAXhGXB4LdlyRvLu58cZHzAbgIgaT+a/rBJ0NA9Xcrm -62XlCTduLq8/YG4MW2rj/5/WJuw= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 600514d0c2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAOpcBOwg644Spvv1VN9vhzAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMi5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABK/slVNeN0WNpvltBiE7xnwdaivZdkHt -7u60Ic42P6tdyk8TKFCUIbmfzhfxZjSOW7zDVA9bWjINqOZbEAr8otKjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMhguKgJODpR -BJQbov75sHB9NLChMEqpNp735gYRad8IMAoGCCqGSM49BAMCA0gAMEUCIQCic1Mz -SJK54EE+RUPCON3WDetRq9R2HZ4AgCs1z+jJDwIgYeP5Bj8NeuPI2jO8/mtPbB4N -yyXkX1mPhsIx+a1JibM= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 13677f75ad..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQC036iJWK1K0Vm/dLyDlgqTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -DCDFaU9rmdwI7uaMIY2ZWktaAEe5t0GXPit9FkSDwIy8CaKwNSjz3zTB53cKAR66 -8fJGzbuW/ByznDAODW41QqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCDI -YLioCTg6UQSUG6L++bBwfTSwoTBKqTae9+YGEWnfCDAKBggqhkjOPQQDAgNHADBE -AiASBO7X1hIYUS0clN+ZhPAXhGXB4LdlyRvLu58cZHzAbgIgaT+a/rBJ0NA9Xcrm -62XlCTduLq8/YG4MW2rj/5/WJuw= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem deleted file mode 100644 index 5d01e004c4..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgI3rCwZzCPM8guDJ+ -ajSV/kgAdJjyf7zNEOXKW1bi2qWhRANCAAQiQrHHkRkoRc1DSPV2KVUAVHJZxjoP -WjYNCAr/328xTuQlFkpFOw3KfgDrUHBzrblcUQKdfisXjVgCYKASLjzW ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem deleted file mode 100644 index ddf5718a55..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAKhANZwTNGWXEMpJPXUAWoMwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMi5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABCJCsceRGShFzUNI9XYpVQBUclnGOg9a -Ng0ICv/fbzFO5CUWSkU7Dcp+AOtQcHOtuVxRAp1+KxeNWAJgoBIuPNajTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMhguKgJODpR -BJQbov75sHB9NLChMEqpNp735gYRad8IMAoGCCqGSM49BAMCA0gAMEUCIQCTkCcO -Uy/ItxFOCYc2uaF5zzXiI47mB656jlhaX26KsgIgd3Ml5iyTvfr9lGF0JDmTu1q3 -wD2u7zjjCkdnPAHuciI= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt deleted file mode 100644 index 47bd46e807..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICZzCCAg2gAwIBAgIQUY35YGOgpYx71B6S44KFxzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcyLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEY1gTIAIslR1l1zLR3w1L+clJT0vX -XvI9zPlzoIpsOPp5RekcuFzIsJGoH6HOxEBHC577ZB1KSmjd4TfkKdwIMaOBlzCB -lDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgeqqvm5HLAt7aNSUKFrtSiv+JZw+8 -ZrGqAn3aRdkKiC4wKAYDVR0RBCEwH4IWcGVlcjAub3JnMi5leGFtcGxlLmNvbYIF -cGVlcjAwCgYIKoZIzj0EAwIDSAAwRQIhANK0B7COi8FWfPZ6v+Lg5TK1c+BBLdzE -Yl0/I6JxzNEuAiAEdWG/RZk8ThSz+Tg6/wT9+Y1v7Zs+rEO8R4ZE0F2tsg== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key deleted file mode 100644 index ab4a76a8c4..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQghvXM4n1aO5Ix55v6 -Yyo2MhOrkr9mzBocMxuUdPYVb+uhRANCAARjWBMgAiyVHWXXMtHfDUv5yUlPS9de -8j3M+XOgimw4+nlF6Ry4XMiwkagfoc7EQEcLnvtkHUpKaN3hN+Qp3Agx ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 600514d0c2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAOpcBOwg644Spvv1VN9vhzAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMi5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABK/slVNeN0WNpvltBiE7xnwdaivZdkHt -7u60Ic42P6tdyk8TKFCUIbmfzhfxZjSOW7zDVA9bWjINqOZbEAr8otKjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMhguKgJODpR -BJQbov75sHB9NLChMEqpNp735gYRad8IMAoGCCqGSM49BAMCA0gAMEUCIQCic1Mz -SJK54EE+RUPCON3WDetRq9R2HZ4AgCs1z+jJDwIgYeP5Bj8NeuPI2jO8/mtPbB4N -yyXkX1mPhsIx+a1JibM= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 13677f75ad..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQC036iJWK1K0Vm/dLyDlgqTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -DCDFaU9rmdwI7uaMIY2ZWktaAEe5t0GXPit9FkSDwIy8CaKwNSjz3zTB53cKAR66 -8fJGzbuW/ByznDAODW41QqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCDI -YLioCTg6UQSUG6L++bBwfTSwoTBKqTae9+YGEWnfCDAKBggqhkjOPQQDAgNHADBE -AiASBO7X1hIYUS0clN+ZhPAXhGXB4LdlyRvLu58cZHzAbgIgaT+a/rBJ0NA9Xcrm -62XlCTduLq8/YG4MW2rj/5/WJuw= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem deleted file mode 100644 index 9fad4f8741..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgX6nt9f/8t01ed6+3 -rctLrx7tLyQTog9GYpLDt+jpDTqhRANCAATGVhUGt26Xk8XYvjm06UiyD5JKLYQC -aSLkK/Y48eA3qY1nm+WuuDlUWaiYur3wW1c9O6mgv0E0lt4/kLd5HQvp ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem deleted file mode 100644 index 21aaf067e5..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAOwAyYSilvbPA/M7/tHtmCswCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMi5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABMZWFQa3bpeTxdi+ObTpSLIPkkothAJp -IuQr9jjx4DepjWeb5a64OVRZqJi6vfBbVz07qaC/QTSW3j+Qt3kdC+mjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMhguKgJODpR -BJQbov75sHB9NLChMEqpNp735gYRad8IMAoGCCqGSM49BAMCA0gAMEUCIQCYserJ -I4SyDLf5l8qsByJhtHdo6Yh2Wtp+8F9nS88yOgIgYLO0HXD0PciLMT3wON8N897/ -H7ZKVzFs60GUUPEojLs= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt deleted file mode 100644 index d0f8c0d90d..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICaDCCAg6gAwIBAgIRAPhoKuUTuWqWpVYfxl4EoHIwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkz -MzAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMi5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOX/wCQZvHycu/aj4E2JUk9Nwv+o -wFjVXj8YDWQIbfz8GR8gB7NBucB1DSqVWFIH3vbZHd5yk+uKLbacshekTWGjgZcw -gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIHqqr5uRywLe2jUlCha7Uor/iWcP -vGaxqgJ92kXZCoguMCgGA1UdEQQhMB+CFnBlZXIxLm9yZzIuZXhhbXBsZS5jb22C -BXBlZXIxMAoGCCqGSM49BAMCA0gAMEUCIQClLgYkgsBU4OobXHUzIeR08ayH2Zim -lflJj9M0462tmAIgPG+e/bJbBH6SQOd18mHAAblnkr3tuhAA/3beNl+loyA= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key deleted file mode 100644 index 828cb88746..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgPrS3HE9kwloZsZXx -jbFRZQeYmtYR1urjZOUEppDJJ26hRANCAATl/8AkGbx8nLv2o+BNiVJPTcL/qMBY -1V4/GA1kCG38/BkfIAezQbnAdQ0qlVhSB9722R3ecpPrii22nLIXpE1h ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem deleted file mode 100644 index 6a55a56f70..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgvXMnZOPfFlzhdVui -iZ8dx02WoBj/5Wr8XKFE3kgvzpGhRANCAAQa3MGNIphRWB4EKCWUAqlFv2XrZv4m -D602h54Lj8YV2BSMJTJtF0NBO5QtnBCGPHZ47llsjvgiHKlAYD79nWI9 ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 600514d0c2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAOpcBOwg644Spvv1VN9vhzAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMi5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABK/slVNeN0WNpvltBiE7xnwdaivZdkHt -7u60Ic42P6tdyk8TKFCUIbmfzhfxZjSOW7zDVA9bWjINqOZbEAr8otKjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMhguKgJODpR -BJQbov75sHB9NLChMEqpNp735gYRad8IMAoGCCqGSM49BAMCA0gAMEUCIQCic1Mz -SJK54EE+RUPCON3WDetRq9R2HZ4AgCs1z+jJDwIgYeP5Bj8NeuPI2jO8/mtPbB4N -yyXkX1mPhsIx+a1JibM= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 13677f75ad..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQC036iJWK1K0Vm/dLyDlgqTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -DCDFaU9rmdwI7uaMIY2ZWktaAEe5t0GXPit9FkSDwIy8CaKwNSjz3zTB53cKAR66 -8fJGzbuW/ByznDAODW41QqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCDI -YLioCTg6UQSUG6L++bBwfTSwoTBKqTae9+YGEWnfCDAKBggqhkjOPQQDAgNHADBE -AiASBO7X1hIYUS0clN+ZhPAXhGXB4LdlyRvLu58cZHzAbgIgaT+a/rBJ0NA9Xcrm -62XlCTduLq8/YG4MW2rj/5/WJuw= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem deleted file mode 100644 index 82afc9479b..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgWZ2bHYYJkpIYDBln -QdajfVlG6tQCarc1xeJaxsnD6iKhRANCAASv7JVTXjdFjab5bQYhO8Z8HWor2XZB -7e7utCHONj+rXcpPEyhQlCG5n84X8WY0jlu8w1QPW1oyDajmWxAK/KLS ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 600514d0c2..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAOpcBOwg644Spvv1VN9vhzAwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA0MDkzMzAwWhcNMjkwMzAxMDkzMzAw -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMi5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABK/slVNeN0WNpvltBiE7xnwdaivZdkHt -7u60Ic42P6tdyk8TKFCUIbmfzhfxZjSOW7zDVA9bWjINqOZbEAr8otKjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMhguKgJODpR -BJQbov75sHB9NLChMEqpNp735gYRad8IMAoGCCqGSM49BAMCA0gAMEUCIQCic1Mz -SJK54EE+RUPCON3WDetRq9R2HZ4AgCs1z+jJDwIgYeP5Bj8NeuPI2jO8/mtPbB4N -yyXkX1mPhsIx+a1JibM= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt deleted file mode 100644 index 2d1e43f642..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeGgAwIBAgIQSXV1YcWe8kQ1uOXGm7CLEjAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELOxYQt7dNQuy/YJ4ro+Gp3fci/N3 -oD+2MNhaGL89qRlI5CVHiVSFTrp6PWa/bMuI4logYkwFqPc0eu5WvRb8O6NsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIHqqr5uRywLe2jUlCha7Uor/iWcPvGax -qgJ92kXZCoguMAoGCCqGSM49BAMCA0gAMEUCIQCEoVvJb4yTI5SrihXzN2pPZxNE -JfLagq33dunflwYp2QIgc9FrZ3BlBKqV/G5Apm9Ydppi7fte/OzO7sKDwM8vlw0= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key deleted file mode 100644 index 1c247352ec..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYSACMS0vuW3TLFnM -OSS9XoXh48ngunYMPXyegqMgiQmhRANCAAQs7FhC3t01C7L9gniuj4and9yL83eg -P7Yw2FoYvz2pGUjkJUeJVIVOuno9Zr9sy4jiWiBiTAWo9zR67la9Fvw7 ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem deleted file mode 100644 index 3f4b8107a8..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQEFiWccH4raigbry2lOm2qzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcyLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEEntYJwtMI1I4E5sJI6k3sn4epMbyZp4a -StAsbd9wL1eXsteQDyEwTXMcByE1pZhVjhZ7jGpyS6skdv0lAnAEYaNNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgyGC4qAk4OlEE -lBui/vmwcH00sKEwSqk2nvfmBhFp3wgwCgYIKoZIzj0EAwIDSAAwRQIhAKzkqXfH -TBXDGIqNlBn0KDmxTvOQWglmUlEecqoxWDxtAiBKdrEavI0HXL/I5AYaJ+/2qeEI -m2nMhcxHpmvn4t2jcQ== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 13677f75ad..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQC036iJWK1K0Vm/dLyDlgqTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -DCDFaU9rmdwI7uaMIY2ZWktaAEe5t0GXPit9FkSDwIy8CaKwNSjz3zTB53cKAR66 -8fJGzbuW/ByznDAODW41QqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCDI -YLioCTg6UQSUG6L++bBwfTSwoTBKqTae9+YGEWnfCDAKBggqhkjOPQQDAgNHADBE -AiASBO7X1hIYUS0clN+ZhPAXhGXB4LdlyRvLu58cZHzAbgIgaT+a/rBJ0NA9Xcrm -62XlCTduLq8/YG4MW2rj/5/WJuw= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem deleted file mode 100644 index f1d05e959c..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgMr2Vl5s+EUxuL6LI -6b4KlL1lHVIByxy6PgQigWdyOVuhRANCAAQSe1gnC0wjUjgTmwkjqTeyfh6kxvJm -nhpK0Cxt33AvV5ey15APITBNcxwHITWlmFWOFnuManJLqyR2/SUCcARh ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem deleted file mode 100644 index 3f4b8107a8..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQEFiWccH4raigbry2lOm2qzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMzMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcyLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEEntYJwtMI1I4E5sJI6k3sn4epMbyZp4a -StAsbd9wL1eXsteQDyEwTXMcByE1pZhVjhZ7jGpyS6skdv0lAnAEYaNNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgyGC4qAk4OlEE -lBui/vmwcH00sKEwSqk2nvfmBhFp3wgwCgYIKoZIzj0EAwIDSAAwRQIhAKzkqXfH -TBXDGIqNlBn0KDmxTvOQWglmUlEecqoxWDxtAiBKdrEavI0HXL/I5AYaJ+/2qeEI -m2nMhcxHpmvn4t2jcQ== ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt deleted file mode 100644 index db0fea36a9..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQS3ivvSw7laR4Doj60sM6hDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEGtzBjSKYUVgeBCgllAKpRb9l62b+Jg+tNoeeC4/GFdgUjCUybRdDQTuU -LZwQhjx2eO5ZbI74IhypQGA+/Z1iPaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCB6qq+bkcsC3to1JQoWu1KK/4lnD7xmsaoCfdpF2QqILjAKBggqhkjOPQQD -AgNIADBFAiEAyAlsWyLkvovdGMTx8tRZvntu4rYyO9VZcSRxyt7NNoQCIHMTGFgs -obCcRFbjXFVNptAR+QDmZTsUNHZIOpt7kPXE ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt deleted file mode 100644 index 50b5a85ae4..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeGgAwIBAgIQCLY95EuOV2Rmq596peAdUzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDQwOTMzMDBaFw0yOTAzMDEwOTMz -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcyLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEq6WVwzwW9+80Ekx4s2P+zIlWzQCu -4hwk7TJJiLZxUoUAwWzfb9Lj0ioxYir6yy/0Lgz8dyR6p/vi0cXuMXK1jaNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIHqqr5uRywLe2jUlCha7Uor/iWcPvGax -qgJ92kXZCoguMAoGCCqGSM49BAMCA0gAMEUCIQCPTDSmjkujXqVSIDbg49k0zE5s -ektRhN6rT5XKJQ4j6AIgIbOAPkrTEKSJ9KRkW5318erls6FvxWMc/URsVp0rJSQ= ------END CERTIFICATE----- diff --git a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key deleted file mode 100644 index 7c312e8c1e..0000000000 --- a/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgBxuxu8Bz9GuHw9DG -MofzxX7ELSbmtav4TtKmgep+jbihRANCAASrpZXDPBb37zQSTHizY/7MiVbNAK7i -HCTtMkmItnFShQDBbN9v0uPSKjFiKvrLL/QuDPx3JHqn++LRxe4xcrWN ------END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/generateAll.sh b/test/fixtures/crypto-material/generateAll.sh index d91170b595..a199606c45 100755 --- a/test/fixtures/crypto-material/generateAll.sh +++ b/test/fixtures/crypto-material/generateAll.sh @@ -1,9 +1,13 @@ -#/bin/bash -# One generate file to rule them all - -cd ./config-base -./generate.sh -cd ../config-update -./generate.sh +#!/bin/bash +# +# SPDX-License-Identifier: Apache-2.0 +# +CRYPTOGEN=$1 +echo '' +echo "Crypto-gen scripts running based on binaries location ${CRYPTOGEN}" +BASEDIR=$(dirname $(realpath $0)) +${BASEDIR}/config-base/generate.sh ${CRYPTOGEN} +${BASEDIR}/config-update/generate.sh ${CRYPTOGEN} +echo '' diff --git a/test/fixtures/fabricca/README.md b/test/fixtures/fabricca/README.md deleted file mode 100644 index 7477ab8fde..0000000000 --- a/test/fixtures/fabricca/README.md +++ /dev/null @@ -1,16 +0,0 @@ -this folder contains the test fixtures for fabric ca integration tests. - -The file test.csr and test.key are generated for testing enroll a user with a csr - -test.csr is the certificate signing request to be sent to fabirc-ca by the API: FabricCAService.enroll() -test.key is the corresponding private key for this user - -The test.key and test.csr are generated by this `openssl` command. -``` -openssl req -nodes -newkey rsa:2048 -keyout test.key -out test.csr -``` - -The necessary information for creating this CSR is: - -Common Name: aTestUser - diff --git a/test/fixtures/fabricca/ecert.pem b/test/fixtures/fabricca/ecert.pem deleted file mode 100644 index 8f20119186..0000000000 --- a/test/fixtures/fabricca/ecert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIB8zCCAZqgAwIBAgIUWvyWRhnNjkgI240frgUO1ajr/qMwCgYIKoZIzj0EAwIw -YzELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQH -EwdSYWxlaWdoMRswGQYDVQQKExJIeXBlcmxlZGdlciBGYWJyaWMxDDAKBgNVBAsT -A0NPUDAeFw0xNjExMjcxMjI0MDBaFw0xNzExMjcxMjI0MDBaMBAxDjAMBgNVBAMT -BWFkbWluMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnrhMQCKVUaJVZywJtkeb -dg4HHoYz7lb6knfglfX3R7OuX504snLlgCsSL8FgjMEMWINVQRA/NtT9kec2j5I7 -OaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF -BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSMVEXbf7pQjqpf2G/bW6S6DTHD -HjAfBgNVHSMEGDAWgBTg2/DcHUvWopkCVxLow6n63y/9QjAKBggqhkjOPQQDAgNH -ADBEAiBH2XyV4MxNb11tyljqo+4iF53GjF26w+JBxHg5T/oOxwIgSUpFO4z0Zd0O -b/f7YhvdYtAhJqqJDv5u21oZrugjXIw= ------END CERTIFICATE----- diff --git a/test/fixtures/fabricca/enroll-csr.pem b/test/fixtures/fabricca/enroll-csr.pem deleted file mode 100644 index de0c986755..0000000000 --- a/test/fixtures/fabricca/enroll-csr.pem +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIHQMHUCAQAwEzERMA8GA1UEAwwIdGVzdFVzZXIwWTATBgcqhkjOPQIBBggqhkjO -PQMBBwNCAASSduelwzsHgCoVVJtMqaEbqkDVXQZiE68ffFc2OMnljKlx0/ndzB2H -jWU9GhEG+zmjMBcARr6b/xas96wZeQ7LoAAwDAYIKoZIzj0EAwIFAANJADBGAiEA -8ODGpt+sqGIMj517SFkNtpMMAlcharmLFsDMWhxlcioCIQDfSU0pOkaEEn0/pWOU -LxB2qFcakcohWyEFQHHDNJVFRw== ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/test/fixtures/fabricca/generateCSR.sh b/test/fixtures/fabricca/generateCSR.sh new file mode 100755 index 0000000000..456ecbbb31 --- /dev/null +++ b/test/fixtures/fabricca/generateCSR.sh @@ -0,0 +1,6 @@ + +BASEDIR=$(dirname $(realpath $0)) +echo "Generating fabricca cetificates and keys in directory ${BASEDIR}" +openssl req -nodes -newkey rsa:2048 -keyout ${BASEDIR}/test.key -out ${BASEDIR}/test.csr -subj "/C=GB/ST=London/L=London/O=Global Security/OU=IT Department/CN=aTestUser" +openssl req -nodes -newkey rsa:512 -keyout ${BASEDIR}/enroll-key.pem -out ${BASEDIR}/enroll-csr.pem -subj "/C=GB/ST=London/L=London/O=Global Security/OU=IT Department/CN=testUser" +echo "Generation complete" diff --git a/test/fixtures/fabricca/test.csr b/test/fixtures/fabricca/test.csr deleted file mode 100644 index aeef3860ca..0000000000 --- a/test/fixtures/fabricca/test.csr +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICzjCCAbYCAQAwgYgxCzAJBgNVBAYTAkNOMRIwEAYDVQQIDAlTaGFuZyBIYWkx -EjAQBgNVBAcMCVNoYW5nIEhhaTETMBEGA1UECgwKVW1hcmtjbG91ZDEMMAoGA1UE -CwwDRGV2MRIwEAYDVQQDDAlhVGVzdFVzZXIxGjAYBgkqhkiG9w0BCQEWC3h4eEB4 -eHguY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq/5e1+PT4ywm -psBhtjVYeGm72B7G2I2+vPhZ2bDiS7kWJ00Eaw9S6xGGh28zXMLoW1ABQzj6J0eb -iqXe6proIhGB4E24KBzhx6ZGVzccaoVEoGNq0OQV98C/jhZ0RrcubxKFT9TC8h3V -VUpdsQP2D3QQgUjwUqUsFAZtg/qn2wtydWCw9FTfnUCUwfhfawS6pPxF3MLXN4Re -iUWZeUunmTFGBX1cnOph1hZd8MLXDKfjvpibpnJO+KUWAWiejzije1TMAT09s9ln -wA7U4t8+wEaxPpdUz8E0M60W8t8p3KSvy38at1hDA8Qa3PaT54NJgH3HHVSoyg19 -qYC1O03BrQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAIKZUvnzOwRoP3WBIcON -T6F3PVDpWSRL0T1RG6RqMs1+mTTfwBDWmWQcdEIgj5+YaF3UmdxFos82U3kSxIaT -wnbLo/hLj9HTNknihFMTopS67BaLyPXdiR13d9YTBZYar831gR8MHKBDCRVFjCYL -zRIZ1NvK/Tv+eeQ4CazCWEZ1yryasjibq8tZ5ByfC0bC0dzDhv317VTXhwK+RKXH -eH4Ne4bxWWJFszyWEFvl3Q5Z02+SxtcU8Nsgr5rnUsOIO7jH+lOGrjZJX2s8oc5Q -+gZKdFkAx7GQUMjgHdOF9MV0ckgRrmPT/ymkVPEz/rKSA/O0AiQgipeWIPLPsgGN -gAY= ------END CERTIFICATE REQUEST----- diff --git a/test/fixtures/fabricca/test.key b/test/fixtures/fabricca/test.key deleted file mode 100644 index 45f01cdb54..0000000000 --- a/test/fixtures/fabricca/test.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCr/l7X49PjLCam -wGG2NVh4abvYHsbYjb68+FnZsOJLuRYnTQRrD1LrEYaHbzNcwuhbUAFDOPonR5uK -pd7qmugiEYHgTbgoHOHHpkZXNxxqhUSgY2rQ5BX3wL+OFnRGty5vEoVP1MLyHdVV -Sl2xA/YPdBCBSPBSpSwUBm2D+qfbC3J1YLD0VN+dQJTB+F9rBLqk/EXcwtc3hF6J -RZl5S6eZMUYFfVyc6mHWFl3wwtcMp+O+mJumck74pRYBaJ6POKN7VMwBPT2z2WfA -DtTi3z7ARrE+l1TPwTQzrRby3yncpK/Lfxq3WEMDxBrc9pPng0mAfccdVKjKDX2p -gLU7TcGtAgMBAAECggEAV8pjRvd3tEFZCUyxk3vvSKdPxqUPAoJ3laV+12s+V0CG -WlEprCwKOwqbDI5qPTMPv2w6+MEgjuQyNLct7bpcOueMz51cHr1/UZVB2kq7KnQT -73pPj4ic3fV40WIMv/vIq9FcUr9bMpKfzgVDhZNsCb9InXVJliXRNfeB9xf+jgOX -grezvIjQYxud0XcBl93XVJETiswplsUxKN0IsGpPwakQL4Dw0C0HKQYV9nkAYwCX -OssrZbzw/9AiSpxJI/cL9Kj39tiXDQd5Y+NLG77OXYd1erNWWU8JiCXlqOni3ZRe -ystjG+H/L2ykrVMxzs7CbjRwOxrcxZJjQSDoWHaUAQKBgQDXe88mS/jOGfen4hAi -jM8y0TZV5+udIv/W6DFSCBGrHsVzRRHWFxoInSqOxAVqnMSQeyPEWKH7KoT2Pds/ -zremYa6KDb1fbrA4PLL9tyJtHxRGl/dGWFGDEld+ftyjsstQ0h81ia6mO8wv1l/X -0GNH8ubphpN3OSFw4W6/FEhjbQKBgQDMVTF+/jgnlX+W6R1ivhJlMA/0Nlm/0/AR -HkLy8dyXN5dOsPvDH74cA+SvRhgCpTR1PxdeagECML7bU8WLEyb2Vl/ooS6khn8A -Gf2JHr5s0zOOioSe+eulE2FOQtoehMUK3IW3RHWUsF5fVSM+976Py44AF0wbfgLJ -n+hCDqmvQQKBgH/kYtk3BA/HR77jpHHtItjlZRttj+DusevqWcN3OI1YsRYuK1zm -zzPHnEepvhE9xEiAXYUemd0Jqmq/4c4oMcXVehND/l6SwpJOLGn7dLpRVOZlMYUV -zCNAEp/oSan650MrwwwykG7nVNQbpzze2N4OI9D8Z6++P8PQeLt+HUytAoGAZoH+ -2MTUixc28RB1y4mrVNQtzMhPciry7sONtq+biMk8wR+MzjDogMl7OmshtIIItSE3 -qgfoBZ9KwGFgYwryqvZeGyhxa9yFbhmb1eR0h8fUv5fCPLcIfsIgONDU+CaHa5GC -C5Tun+9zCMR/cCF9mkn2LRmC9u/amif8rtcITYECgYA92PDXURfoQMFBHIPZ01bO -G27pi4YAhOSiAvr58w46okqOzCD+gS7hDw3jZOl/y2j+3N1hKkhWqY5mSZhT4eQx -UbAb9jUYE3//CjeK1vKFTknjQjUrD5Z3JD6Dh2RMT4olJuYSRtyjACS5CccUclDy -IhR+2kbCBC2gkX7c8TKuZw== ------END PRIVATE KEY----- diff --git a/test/scenario/README.md b/test/scenario/README.md index ba45574187..38ff10d9ba 100644 --- a/test/scenario/README.md +++ b/test/scenario/README.md @@ -11,6 +11,8 @@ Welcome to the Fabric-SDK-Node Cucumber test readme. Below are some notes on the This test suite is intended to provide high level test coverage from a scenario perspective, and tests herein represent those at the top of the test pyramid. Consequently, these test should be added to with due consideration and should encapsulate the completion of a high level user task; for more fine grained testing, the FV or unit test frameworks should be used. +The test suite uses the docker network and crypto files from within `/test/fixtures`. If crypto material does not exist, which is the case if you have recently cloned the repository, it is necessary to run the `install-and-generate-certs` gulp task prior to running the tests. + ## Structure The folder structure is the following: @@ -27,12 +29,8 @@ scenario │ └───node │ └───config -│ │ profile.json -│ │ policies.json -│ └───crypto-config -│ -└───docker-compose -│ compose-files.yaml +│ profile.json +│ policies.json │ └───features │ feature_file.feature @@ -46,10 +44,9 @@ scenario ``` -- The scenario tests and all required files are contained within the `scenario` directory +- The scenario tests and all required test files are contained within the `scenario` directory - `chaincode` holds all the chaincode files used within the cucumber test, with each chaincode contained within a specific named folder, itself decomposed into goLang and node. The structure here is important, since step files rely on the consistent location and naming strategy to deploy named chaincode of a specific type. -- `config` contains connection profiles, a json document of all possible endorsement policies, and a crypto-config directory that contains the crypto-material for the network defined within the docker-compose folder. -- `docker-compose` contains the two test networks, tls and non-tls, that are used within the cucumber tests. +- `config` contains connection profiles, and a json document of all possible endorsement policies - All feature files and supporting files are contained in the `features` directory - `*.feature` the self contained feature file that describes a set of feature scenarios that decompose into programmatic steps - `lib` contains helper files used by step files. @@ -57,6 +54,7 @@ scenario - `support` contains two framework files: the main `index.js` file called by the cucumber test runner, and a `hooks.js` file that is used to provide tag based before/after hooks. + ## Running the Tests The tests are run at a high level within the `/build` directory using the main `test.js` gulp file, or the npm script: