diff --git a/build/tasks/test.js b/build/tasks/test.js index a5a1ceb5fc..8fea491337 100644 --- a/build/tasks/test.js +++ b/build/tasks/test.js @@ -21,7 +21,7 @@ const shell = require('gulp-shell'); const testConstants = require('../../test/unit/constants.js'); // Debug level of Docker containers used in scenario tests -process.env.DOCKER_DEBUG = 'INFO'; +process.env.DOCKER_DEBUG = 'debug'; // by default for running the tests print debug to a file const debugPath = path.join(testConstants.tempdir, 'test-log', 'debug.log'); @@ -98,10 +98,8 @@ gulp.task('docker-clean', shell.task([ 'docker rmi $(docker images | grep "^dev-" | awk \'{print $3}\')', // clean up all the containers created by docker-compose - // -tape - 'docker-compose -f test/fixtures/docker-compose.yaml down', - // -cucumber - 'docker-compose -f test/scenario/docker-compose/docker-compose-tls.yaml down' + 'docker-compose -f test/fixtures/docker-compose/docker-compose-tls-level-db.yaml -p node down', + 'docker-compose -f test/fixtures/docker-compose/docker-compose-tls.yaml -p node down' ], { verbose: true, // so we can see the docker command output ignoreErrors: true // kill and rm may fail because the containers may have been cleaned up @@ -109,7 +107,7 @@ gulp.task('docker-clean', shell.task([ gulp.task('docker-ready', ['docker-clean'], shell.task([ // make sure that necessary containers are up by docker-compose - 'docker-compose -f test/fixtures/docker-compose.yaml up -d' + 'docker-compose -f test/fixtures/docker-compose/docker-compose-tls-level-db.yaml -p node up -d' ])); gulp.task('lint', ['eslint', 'tslint']); diff --git a/fabric-client/test/BlockDecoder.js b/fabric-client/test/BlockDecoder.js index 9d5fe86045..3a766ba29d 100644 --- a/fabric-client/test/BlockDecoder.js +++ b/fabric-client/test/BlockDecoder.js @@ -31,7 +31,7 @@ describe('BlockDecoder', () => { let FakeLogger; before(() => { - data = fs.readFileSync(path.join(__dirname, '../../test/fixtures/channel/twoorgs.genesis.block')); + data = fs.readFileSync(path.join(__dirname, '../../test/fixtures/crypto-material/config-base/twoorgs.genesis.block')); }); beforeEach(() => { diff --git a/scripts/check_license.sh b/scripts/check_license.sh index 31277c6aa3..0bc331ca3e 100755 --- a/scripts/check_license.sh +++ b/scripts/check_license.sh @@ -14,11 +14,11 @@ function filterExcludedFiles { | grep -v "^LICENSE$" \ | grep -v "\.png$" \ | grep -v "\.rst$" \ - | grep -v "\.pem$" \ | grep -v "\.block$" \ | grep -v "\.tx$" \ | grep -v "\.txt$" \ - | grep -v "_sk$" \ + | grep -v "\.pem$" \ + | grep -v ".crt$" \ | grep -v "\.key$" \ | grep -v "\.gen\.go$" \ | grep -v "^Gopkg\.lock$" \ diff --git a/test/fixtures/caimport.json b/test/fixtures/caimport.json index 2212d580a7..dac2cf378d 100644 --- a/test/fixtures/caimport.json +++ b/test/fixtures/caimport.json @@ -1,14 +1,14 @@ { "ca-import" : { - "orgs": { + "orgs": { "org1": { "username": "admin", "name": "peerOrg1", "mspid": "Org1MSP", "storePath": "/tmp/hfc-test-kvs_org1", "cryptoContent": { - "privateKey": "../fixtures/msp/local/keystore/admin.pem", - "signedCert": "../fixtures/msp/local/signcerts/admin.pem" + "privateKey": "../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem", + "signedCert": "../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem" } }, "org2": { @@ -17,8 +17,8 @@ "mspid": "Org2MSP", "storePath": "/tmp/hfc-test-kvs_org2", "cryptoContent": { - "privateKeyPEM": "-----BEGIN PRIVATE KEY-----MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2HxfPVxvwHYM5X8o/tEoDZ54Rl9uW13U6RElpnFOCruhRANCAATx8pv9DCChfwHoa7IRUf2z7GTmC3k2Tl8e7DWA9fZ4cpL9vdk0ZMgQZKo8Gm61NSTuHMZ8zp3uZn7QOcCmwuDg-----END PRIVATE KEY-----", - "signedCertPEM": "-----BEGIN CERTIFICATE-----MIIB8TCCAZegAwIBAgIUasxwoRvBrGrdyg9+HtdJ3brpcuMwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdldHMsIEluYy4xDDAKBgNVBAsTA1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTcwMTE5MTk1NjAwWhcNMTcxMjE5MDM1NjAwWjAQMQ4wDAYDVQQDEwVhZG1pbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPHym/0MIKF/AehrshFR/bPsZOYLeTZOXx7sNYD19nhykv292TRkyBBkqjwabrU1JO4cxnzOne5mftA5wKbC4OCjYDBeMA4GA1UdDwEB/wQEAwICBDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQtEfVCvKOzNSiTgpaWzaYVm6eaBzAfBgNVHSMEGDAWgBQXZ0I9qp6CP8TFHZ9bw5nRtZxIEDAKBggqhkjOPQQDAgNIADBFAiEAvGd5YDIBeQZWpP9wEHFmezvSCjrzy8VcvH/7Yuv3vcoCICy5ssNrEHEyWXqBqeKfU/zrPhHsWJFIaJEDQLRQE05l-----END CERTIFICATE-----" + "privateKeyPEM": "../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem", + "signedCertPEM": "../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem" } } } diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/ca/eaade59087c6d97fcf350e94f37ad9f2c692bb66f182148ce58940de70ade9ce_sk b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/ca/eaade59087c6d97fcf350e94f37ad9f2c692bb66f182148ce58940de70ade9ce_sk deleted file mode 100755 index 278a8edbc4..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/ca/eaade59087c6d97fcf350e94f37ad9f2c692bb66f182148ce58940de70ade9ce_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgMOKUs/EytOuKG/kW -qZ8OHBb1aJ4zodJVqYWwcpH5FluhRANCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCU -PEe1Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQ ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/ca/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/ca/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/ca/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index cb68b5959b..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-tls-cert.pem deleted file mode 100644 index 604c9c35d4..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBcjCCARigAwIBAwICA+gwCgYIKoZIzj0EAwIwFjEUMBIGA1UEAwwLb3JkZXJl -ck9yZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjAWMRQwEgYDVQQD -DAtvcmRlcmVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK8Sv0EA9h06 -fmBkUCO+D/b/2INZ2huy+W/HCxSF22c7WGoJbRzQcWtQmW1KqZowUk86RcxVfFqv -jEMFVXzV38SjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFCVakuvq -xEcK8pYMf/Hw8hsexRMTMB8GA1UdIwQYMBaAFCVakuvqxEcK8pYMf/Hw8hsexRMT -MAoGCCqGSM49BAMCA0gAMEUCIQCmXgDSRTyxpSk+PXg0FNlYZ4ijTVwKgLkYVhod -zZPfngIgO4y0p3Fs/gNsJYrroKaaVDe955KrPp/O55jYDKAD/oY= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-tls-cert.pem deleted file mode 100644 index ac4f5af8d4..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-tls-cert.pem deleted file mode 100644 index d02884fa17..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/signcerts/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/signcerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/signcerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-tls-cert.pem deleted file mode 100644 index 0309ef551f..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-tls-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNTCCAdygAwIBAgIRAPMzoI7K8QG4k7AzN7IhxhEwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xODAyMjExODQwMzJaFw0yODAyMTkxODQwMzJaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARXNh/8ySinCUnJi2T3 -cs4m3au0lHjallzAe6PcDz9++1bOl4CggAY0HxNov3nxtYoUJZcRhnE5an1PPipM -71hdo18wXTAOBgNVHQ8BAf8EBAMCAaYwDwYDVR0lBAgwBgYEVR0lADAPBgNVHRMB -Af8EBTADAQH/MCkGA1UdDgQiBCBQa5ovzv+NOu9CqfL/a885FjzDQZCg0D1kB+Oe -IdcBUTAKBggqhkjOPQQDAgNHADBEAiAZ7PcHMWpc2iu0dc43lwhq0wKLLVleCfgZ -JgRwdjw3wgIgMhcaHqv/W5MAudy9kjeJHIFembEJuWe/+krL6v//yw8= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-tls-cert.pem deleted file mode 100644 index 886ecf1092..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-tls-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAN6NNLMddiNQbv9O9XXVtYkwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABDcanv4coQ10L/0jwxXuHcn8YtJEiqQRNSbKWLqf3/1mwYk8EEDHT4k9 -u1f+zS4T+qmSHSXbnFY+EN/ML5/1OGmjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJDbRSUVw/eK -6MzDHCybxAB60iGHBjtRkAIrOcT3xytTMAoGCCqGSM49BAMCA0cAMEQCIAGAMw2G -Kn0n52XceSFMyioH4Uo0dpkYaxKFk0P9vBTTAiBd0AQ0WFc/w1wuaShK3hWNg9Ey -F9kotvRE5Hu0gweb1w== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-tls-cert.pem deleted file mode 100644 index 76d7be38cd..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-tls-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAMXlqdLr7+td1aShJFAZungwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABO7WAyDbk/B2w9mmauuRSlOwFL1crwmiu9oDu83/Veh9ghrNRsbK2chV -j5PoY+H5PlRbqA8ZdbmDhHhDho9KBqejXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO+KUPKtAXWt -BPdjC4N80Yys3wJ9i4/mxz1ikCFJ890EMAoGCCqGSM49BAMCA0cAMEQCID4dOXH8 -6ginPTS17oyyowkdM34Z5ATPdA7WytfA8IW+AiA0jguTMYimuWEWuTulOgyNZ3ai -hzFkzY/dm7duN86yJQ== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/admincerts/Admin@example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index cb68b5959b..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/cacerts/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/cacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/cacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/keystore/e8a4fdaacf1ef1d925686f19f56eb558b6c71f0116d85916299fc1368de2d58a_sk b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/keystore/e8a4fdaacf1ef1d925686f19f56eb558b6c71f0116d85916299fc1368de2d58a_sk deleted file mode 100755 index 9f83a878a0..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/keystore/e8a4fdaacf1ef1d925686f19f56eb558b6c71f0116d85916299fc1368de2d58a_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0D9/qySG+JbELX4u -WYxknY5CP4p6sVnetkfHGs7WBW+hRANCAATcybHflJqj6M8vzGCT30gfoZBPpbiP -jp4GgIOUHbiIuHz7y5I480+1YY++JcbS6nDZCh2EJRhFAQ5ZtJZLbbHO ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/signcerts/orderer.example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/signcerts/orderer.example.com-cert.pem deleted file mode 100644 index 7501ca153b..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/signcerts/orderer.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHzCCAcWgAwIBAgIRANzg3GjG7MdyBWTlVQ42QbAwCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFgxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAE3Mmx35Sao+jPL8xgk99IH6GQT6W4j46eBoCDlB24iLh8+8uSOPNP -tWGPviXG0upw2QodhCUYRQEOWbSWS22xzqNiMGAwDgYDVR0PAQH/BAQDAgWgMBMG -A1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg6q3l -kIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt6c4wCgYIKoZIzj0EAwIDSAAwRQIh -APf6n3hu/VwDz0N3GeJrsfksmq6ZRJ74NgKL7jHpNtsvAiALjSzODY+s48c5rF+A -Kn4JjmSH4UlcXcRGBsQpP+qXfg== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/admincerts/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/admincerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/admincerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/cacerts/example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/cacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/cacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/ef8e88d28a86f23466ad378003d819561adbedc77fe90cc250424ce4de179a3c_sk b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/ef8e88d28a86f23466ad378003d819561adbedc77fe90cc250424ce4de179a3c_sk deleted file mode 100755 index 7cc31b4915..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/ef8e88d28a86f23466ad378003d819561adbedc77fe90cc250424ce4de179a3c_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgKi/7SbU0tzemhB4/ -gZY1pts4cjYsrMTL7SSGkDSpSkahRANCAASkearIgWkEsdLMtSv+xBaQSQ3lTwun -C236iI47aLLjHzTYw61UfV/LPnTy3lm1D+aiZlpxNZGfydFsk56kWygN ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem b/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem deleted file mode 100644 index cb68b5959b..0000000000 --- a/test/fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/a22daf356b2aab5792ea53e35f66fccef1d7f1aa2b3a2b92dbfbf96a448ea26a_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/a22daf356b2aab5792ea53e35f66fccef1d7f1aa2b3a2b92dbfbf96a448ea26a_sk deleted file mode 100755 index 7f4833522f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/a22daf356b2aab5792ea53e35f66fccef1d7f1aa2b3a2b92dbfbf96a448ea26a_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7hAb34OQ5le9208+ -LC0V5mvjS9223gy8/LWaHy+bnUWhRANCAAS4ud+Na5q4hhRwplUy3YDxqQxUYMIJ -h0ri2sjLBj9MhJrF4d4SgMtuH9Zo8f7fFk/RtrAHcDjbD7HyjEgiqWka ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 0797d01c88..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-tls-cert.pem deleted file mode 100644 index ac4f5af8d4..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org2.example.com-tls-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org2.example.com-tls-cert.pem deleted file mode 100644 index d02884fa17..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org2.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/signcerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/signcerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/signcerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/admincerts/Admin@org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 0797d01c88..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/cacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/keystore/ecd9f80eb183352d5d4176eeb692e30bbfba4c38813ff9a0b6b799b546dda1d8_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/keystore/ecd9f80eb183352d5d4176eeb692e30bbfba4c38813ff9a0b6b799b546dda1d8_sk deleted file mode 100755 index 50c8b1e6be..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/keystore/ecd9f80eb183352d5d4176eeb692e30bbfba4c38813ff9a0b6b799b546dda1d8_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg+tWlPzRwoknNCHmn -QIw/DiQ5WXOoq8TbclyNz8CwApChRANCAAQlWnZyzstbrL/UpBdf/zB6G2yydJgY -AWRytAhXEGMAXXw/RpneaJNpZlUgGOJ0q47IUTKzRvlr6vK31kyULKJK ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/signcerts/peer0.org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/signcerts/peer0.org1.example.com-cert.pem deleted file mode 100644 index f02881d90f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/signcerts/peer0.org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLDCCAdKgAwIBAgIRALLqpJNBvjJnfDisCe33w6wwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBb -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMS5leGFtcGxlLmNvbTBZMBMG -ByqGSM49AgEGCCqGSM49AwEHA0IABCVadnLOy1usv9SkF1//MHobbLJ0mBgBZHK0 -CFcQYwBdfD9Gmd5ok2lmVSAY4nSrjshRMrNG+Wvq8rfWTJQsokqjYjBgMA4GA1Ud -DwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsG -A1UdIwQkMCKAIKItrzVrKqtXkupT419m/M7x1/GqKzorktv7+WpEjqJqMAoGCCqG -SM49BAMCA0gAMEUCIQCHf6KuKNKDY65EEzxh2hg8Nxx33d35wUX5H9GkjtnphQIg -X2qGwCc+YoPDg+8JZmRlZ0zAy/6dWiY0xzVJ3/CMbYI= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/cert.pem deleted file mode 100644 index 5403e6cdb6..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/cert.pem +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfzCCAiWgAwIBAgIUNAqZVk9s5/HR7k30feNp8DrYbK4wCgYIKoZIzj0EAwIw -cDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh -biBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMT -EG9yZzEuZXhhbXBsZS5jb20wHhcNMTgwMjI2MjAwOTAwWhcNMTkwMjI2MjAxNDAw -WjBdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExFDASBgNV -BAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZjbGllbnQxDjAMBgNVBAMTBWFkbWlu -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEz05miTKv6Vz+qhc5362WIZ44fs/H -X5m9zDOifle5HIjt4Usj+TiUgT1hpbI8UI9pueWhbrZpZXlX6+mImi52HaOBrzCB -rDAOBgNVHQ8BAf8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPnxMtT6jgYsMAgI38ponGs8sgbqMCsG -A1UdIwQkMCKAIKItrzVrKqtXkupT419m/M7x1/GqKzorktv7+WpEjqJqMCEGA1Ud -EQQaMBiCFnBlZXIwLm9yZzEuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSAAwRQIh -AM1JowZMshCRs6dnOfRmUHV7399KnNvs5QoNw93cuQuAAiBtBEGh1Xt50tZjDcYN -j+yx4IraL4JvMrCHbR5/R+Xo1Q== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/key.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/key.pem deleted file mode 100755 index ddc6db8ae1..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgbTXpl4NGXuPtSC/V -PTVNGVBgVv8pZ6kGktVcnQD0KiKhRANCAATPTmaJMq/pXP6qFznfrZYhnjh+z8df -mb3MM6J+V7kciO3hSyP5OJSBPWGlsjxQj2m55aFutmlleVfr6YiaLnYd ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/admincerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/admincerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/admincerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/cacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk deleted file mode 100755 index fe50ae38bc..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgS0L+WeTBa4vdUW4j -rogLu8JmLSjda0YcA2TWOfaR+8yhRANCAAQO41JsWQE2pt2UZ/DBdIcpa/inDZ4U -54P5VcIdXgISsEqdRcGLBz+cvvrpTNedaeyNRSndk5LMIJ/npw2Qua/p ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 0797d01c88..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/admincerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/admincerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/admincerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/cacerts/org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/keystore/e4af7f90fa89b3e63116da5d278855cfb11e048397261844db89244549918731_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/keystore/e4af7f90fa89b3e63116da5d278855cfb11e048397261844db89244549918731_sk deleted file mode 100755 index 6554d7b6c7..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/keystore/e4af7f90fa89b3e63116da5d278855cfb11e048397261844db89244549918731_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQglAOKVjiJSAYj5KnC -vmX99WJhlSwjZ07F8a+gohlPOKihRANCAARVCrjQpYsFfROLZkm1lnd7b/+GROpO -AhiImGijSYx2COmFY5UzBJdja7ElnDjGdWsrPvcSdhMI7ELw2omQZyT3 ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/signcerts/User1@org1.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/signcerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 33e53db9cd..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/signcerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLDCCAdKgAwIBAgIRAKZHheCZPE+GMLRV2WXBr10wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBb -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMS5leGFtcGxlLmNvbTBZMBMG -ByqGSM49AgEGCCqGSM49AwEHA0IABFUKuNCliwV9E4tmSbWWd3tv/4ZE6k4CGIiY -aKNJjHYI6YVjlTMEl2NrsSWcOMZ1ays+9xJ2EwjsQvDaiZBnJPejYjBgMA4GA1Ud -DwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsG -A1UdIwQkMCKAIKItrzVrKqtXkupT419m/M7x1/GqKzorktv7+WpEjqJqMAoGCCqG -SM49BAMCA0gAMEUCIQD3hsHS1DS9Ox7tq46p7x0QWP9yc++M7XA7PRf8L7wX/QIg -U0LdIXJrhxAXX29tC/qG2QGPA4T5QTCKZZcVNaAT/LQ= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/464d550fe9bf9e7d8976cdf59d1a5d472598f54c058c3546317c5c5fb0ddfd6e_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/464d550fe9bf9e7d8976cdf59d1a5d472598f54c058c3546317c5c5fb0ddfd6e_sk deleted file mode 100755 index 0023b96e4f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/464d550fe9bf9e7d8976cdf59d1a5d472598f54c058c3546317c5c5fb0ddfd6e_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgTevmjSx6rk995Flz -Z1lLWbSCPnpkV2+H6+0fbLHgGxehRANCAAQ6GE1wdDI/Y/oklMjNbO22WVWw5j+7 -U3o9KljaUtSuz0bEDtoU30rosEK86Wk7hieFED2ILvZkySk1shFVkNqU ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 273d43d183..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/signcerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/signcerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/signcerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/admincerts/Admin@org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 273d43d183..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/cacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/keystore/81c71fd393054571c8d789f302a10390e0e83eb079b02a26a162ee26f02ff796_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/keystore/81c71fd393054571c8d789f302a10390e0e83eb079b02a26a162ee26f02ff796_sk deleted file mode 100755 index cb4c08d36a..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/keystore/81c71fd393054571c8d789f302a10390e0e83eb079b02a26a162ee26f02ff796_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgjlkrze8DhYt8LpCh -kXJyUr6HOp9Jga5RXoOMPFC+J0yhRANCAARYOh3QPZB39zR+JKqVHD+NZqGwMSa3 -05zPyTod7ySx+qbXOXQOZo9AxX9eg7alhlQrSniME8YZIucNANKTEMp0 ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/signcerts/peer0.org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/signcerts/peer0.org2.example.com-cert.pem deleted file mode 100644 index da45859abb..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/signcerts/peer0.org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLDCCAdKgAwIBAgIRAOvtY/+3TfiQKgN49CsrpLEwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBb -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMi5leGFtcGxlLmNvbTBZMBMG -ByqGSM49AgEGCCqGSM49AwEHA0IABFg6HdA9kHf3NH4kqpUcP41mobAxJrfTnM/J -Oh3vJLH6ptc5dA5mj0DFf16DtqWGVCtKeIwTxhki5w0A0pMQynSjYjBgMA4GA1Ud -DwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsG -A1UdIwQkMCKAIEZNVQ/pv559iXbN9Z0aXUclmPVMBYw1RjF8XF+w3f1uMAoGCCqG -SM49BAMCA0gAMEUCIQC2FP9CW85/5dwQ0/4perHKGYaL2h/pZKpZTvlqA6AjdwIg -bee43v7a0+TqKkvI41rW6L5l+scxf9R+1Dp2s8UASus= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/cert.pem deleted file mode 100644 index 93c4cc43f8..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/cert.pem +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfzCCAiWgAwIBAgIUP10YV9H0k3awYvx/YQGbt4xSU0gwCgYIKoZIzj0EAwIw -cDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh -biBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMT -EG9yZzIuZXhhbXBsZS5jb20wHhcNMTgwMjI2MjAxMDAwWhcNMTkwMjI2MjAxNTAw -WjBdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExFDASBgNV -BAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZjbGllbnQxDjAMBgNVBAMTBWFkbWlu -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4tZMwelomMmJuRuX2z2f+LzSK4vS -VwCxQezCUADzEbImVknEXbL0OGf+JfXFhdyer7NRu05ErU9DbW9dkvBJeaOBrzCB -rDAOBgNVHQ8BAf8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFE9WIFRHLVEBLb1cLkfly9pIPd5XMCsG -A1UdIwQkMCKAIEZNVQ/pv559iXbN9Z0aXUclmPVMBYw1RjF8XF+w3f1uMCEGA1Ud -EQQaMBiCFnBlZXIwLm9yZzIuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSAAwRQIh -AM6xI6LLT/P75KefAeP6Lmh0Ih0onbh5KeE6IbDVYOItAiBaRJ1z7aMUHy/ve5jb -TMhvWNDb463/VdvupdJ+o5J73w== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/key.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/key.pem deleted file mode 100755 index d844789eb1..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2tjri0pHTTlGOt1n -EwgqxdqIfgpZdMIsnO2dLTX2qKOhRANCAATi1kzB6WiYyYm5G5fbPZ/4vNIri9JX -ALFB7MJQAPMRsiZWScRdsvQ4Z/4l9cWF3J6vs1G7TkStT0Ntb12S8El5 ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/admincerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/admincerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/admincerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/cacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/5a983ddcbefe52a7f9b8ee5b85a590c3e3a43c4ccd70c7795bec504e7f74848d_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/5a983ddcbefe52a7f9b8ee5b85a590c3e3a43c4ccd70c7795bec504e7f74848d_sk deleted file mode 100755 index 5953ddb1a4..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/5a983ddcbefe52a7f9b8ee5b85a590c3e3a43c4ccd70c7795bec504e7f74848d_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9cyRkWbKn8mFu2/H -HxMneHaDJgUIYD1NNMill5Etb9uhRANCAAT8vNxSBryBW63biAsRd8QIBMVBRlnD -e5Vi8wt+p58NASoDu/XYN38NRJa9MbM4JHbCkVSpf3OJ1HQRRqOqc6Xg ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 273d43d183..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/admincerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/admincerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/admincerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/cacerts/org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/keystore/ce96b95b8ca136f17ff682d99a53f5f029bd90ba2dcd19aa04a1fbe6df59a3f1_sk b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/keystore/ce96b95b8ca136f17ff682d99a53f5f029bd90ba2dcd19aa04a1fbe6df59a3f1_sk deleted file mode 100755 index 6d633fec79..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/keystore/ce96b95b8ca136f17ff682d99a53f5f029bd90ba2dcd19aa04a1fbe6df59a3f1_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0ToCLZ9mCaZovZpA -/5MZqxjfuZBbyLVftjP/Wsji9tmhRANCAAR2xaWMIy41g2N9svC/4bFtEYYSdwf9 -RdGSgYZn1WDbOpAUl1g9Ro7Ys4JkFrRqdbg8V8RPtmcJGFJbZVPfOx9h ------END PRIVATE KEY----- diff --git a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/signcerts/User1@org2.example.com-cert.pem b/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/signcerts/User1@org2.example.com-cert.pem deleted file mode 100644 index 62b830c180..0000000000 --- a/test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/signcerts/User1@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIQLKJhtKqqMCGzcyWeO+oNVDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEdsWljCMuNYNjfbLwv+GxbRGGEncH/UXRkoGG -Z9Vg2zqQFJdYPUaO2LOCZBa0anW4PFfET7ZnCRhSW2VT3zsfYaNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDSAAwRQIhAN6yovenryWzuNLg7/tWVlAuVIfEcMNXzsPqkDnjZ62+AiAN -T8K300zijaLfUoeyxNiNclT3JAhNjNxPkYkRKVb/6A== ------END CERTIFICATE----- diff --git a/test/fixtures/channel/twoorgs.genesis.block b/test/fixtures/channel/twoorgs.genesis.block deleted file mode 100644 index 79773c1a73..0000000000 --- a/test/fixtures/channel/twoorgs.genesis.block +++ /dev/null @@ -1,372 +0,0 @@ - -" %,|Vt(x=dbU ̽ - - -y -[쳶" testchainid*@cdad2d7a639cab769332bf889e0f4bc59a5db7e21c21441783a4d6bd7d10b7adjL"w{K?7Ӹ6 -S -OrdererSP - -OrdererMSPPO -MSPOOO - -OrdererMSP-----BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBcjCCARigAwIBAwICA+gwCgYIKoZIzj0EAwIwFjEUMBIGA1UEAwwLb3JkZXJl -ck9yZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjAWMRQwEgYDVQQD -DAtvcmRlcmVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK8Sv0EA9h06 -fmBkUCO+D/b/2INZ2huy+W/HCxSF22c7WGoJbRzQcWtQmW1KqZowUk86RcxVfFqv -jEMFVXzV38SjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFCVakuvq -xEcK8pYMf/Hw8hsexRMTMB8GA1UdIwQYMBaAFCVakuvqxEcK8pYMf/Hw8hsexRMT -MAoGCCqGSM49BAMCA0gAMEUCIQCmXgDSRTyxpSk+PXg0FNlYZ4ijTVwKgLkYVhod -zZPfngIgO4y0p3Fs/gNsJYrroKaaVDe955KrPp/O55jYDKAD/oY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- -"-----BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- -B -SHA2SHA256J-----BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICNTCCAdygAwIBAgIRAPMzoI7K8QG4k7AzN7IhxhEwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xODAyMjExODQwMzJaFw0yODAyMTkxODQwMzJaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARXNh/8ySinCUnJi2T3 -cs4m3au0lHjallzAe6PcDz9++1bOl4CggAY0HxNov3nxtYoUJZcRhnE5an1PPipM -71hdo18wXTAOBgNVHQ8BAf8EBAMCAaYwDwYDVR0lBAgwBgYEVR0lADAPBgNVHRMB -Af8EBTADAQH/MCkGA1UdDgQiBCBQa5ovzv+NOu9CqfL/a885FjzDQZCg0D1kB+Oe -IdcBUTAKBggqhkjOPQQDAgNHADBEAiAZ7PcHMWpc2iu0dc43lwhq0wKLLVleCfgZ -JgRwdjw3wgIgMhcaHqv/W5MAudy9kjeJHIFembEJuWe/+krL6v//yw8= ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAN6NNLMddiNQbv9O9XXVtYkwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABDcanv4coQ10L/0jwxXuHcn8YtJEiqQRNSbKWLqf3/1mwYk8EEDHT4k9 -u1f+zS4T+qmSHSXbnFY+EN/ML5/1OGmjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJDbRSUVw/eK -6MzDHCybxAB60iGHBjtRkAIrOcT3xytTMAoGCCqGSM49BAMCA0cAMEQCIAGAMw2G -Kn0n52XceSFMyioH4Uo0dpkYaxKFk0P9vBTTAiBd0AQ0WFc/w1wuaShK3hWNg9Ey -F9kotvRE5Hu0gweb1w== ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAMXlqdLr7+td1aShJFAZungwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABO7WAyDbk/B2w9mmauuRSlOwFL1crwmiu9oDu83/Veh9ghrNRsbK2chV -j5PoY+H5PlRbqA8ZdbmDhHhDho9KBqejXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO+KUPKtAXWt -BPdjC4N80Yys3wJ9i4/mxz1ikCFJ890EMAoGCCqGSM49BAMCA0cAMEQCID4dOXH8 -6ginPTS17oyyowkdM34Z5ATPdA7WytfA8IW+AiA0jguTMYimuWEWuTulOgyNZ3ai -hzFkzY/dm7duN86yJQ== ------END CERTIFICATE----- -Admins"4 -Admins*  - -OrdererMSPAdmins"3 -Readers( - -OrdererMSPAdmins"3 -Writers( - -OrdererMSPAdmins*Admins! - ConsensusType -soloAdmins" - BatchSize  -1 Admins! - BatchTimeout -500msAdmins -ChannelRestrictionsAdmins$ - Capabilities - - -V1_1Admins"" -Readers  -ReadersAdmins"" -Writers  -WritersAdmins"" -Admins - -AdminsAdmins"* -BlockValidation  -WritersAdmins*Admins5 - Consortiums54 -SampleConsortium4 -Org1MSP -MSP -Org1MSP-----BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- -"-----BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- -B -SHA2SHA256J-----BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- -Admins"0 -Readers%  -Org1MSPAdmins"0 -Writers%  -Org1MSPAdmins"1 -Admins'  -Org1MSPAdmins*Admins -Org2MSP -MSP -Org2MSP-----BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- -"-----BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- -B -SHA2SHA256J-----BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- -Admins"0 -Writers%  -Org2MSPAdmins"1 -Admins'  -Org2MSPAdmins"0 -Readers%  -Org2MSPAdmins*Admins@ -ChannelCreationPolicy'  -Admins/Channel/Orderer/Admins*/Channel/Orderer/Admins"- -Admins#/Channel/Orderer/Admins*/Channel/Orderer/Admins& -HashingAlgorithm -SHA256Admins- -BlockDataHashingStructureAdminsI -OrdererAddresses5 -orderer.example.com:7050/Channel/Orderer/Admins$ - Capabilities - - -V1_1Admins"" -Writers  -WritersAdmins"" -Admins - -AdminsAdmins"" -Readers  -ReadersAdmins*Admins - - - - \ No newline at end of file diff --git a/test/fixtures/crypto-material/README.md b/test/fixtures/crypto-material/README.md new file mode 100644 index 0000000000..b6d61cc7b6 --- /dev/null +++ b/test/fixtures/crypto-material/README.md @@ -0,0 +1,12 @@ +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. diff --git a/test/fixtures/channel/mychanneltx.tx b/test/fixtures/crypto-material/channel-config/adminconfig.tx similarity index 87% rename from test/fixtures/channel/mychanneltx.tx rename to test/fixtures/crypto-material/channel-config/adminconfig.tx index 4f826d3c66..bef4b7b1ef 100644 Binary files a/test/fixtures/channel/mychanneltx.tx and b/test/fixtures/crypto-material/channel-config/adminconfig.tx differ diff --git a/test/fixtures/channel/discovery.tx b/test/fixtures/crypto-material/channel-config/discovery.tx similarity index 92% rename from test/fixtures/channel/discovery.tx rename to test/fixtures/crypto-material/channel-config/discovery.tx index b8ea0d863c..827e2e3cff 100644 Binary files a/test/fixtures/channel/discovery.tx and b/test/fixtures/crypto-material/channel-config/discovery.tx differ diff --git a/test/fixtures/channel/discovery_anchor.tx b/test/fixtures/crypto-material/channel-config/discovery_anchor.tx similarity index 84% rename from test/fixtures/channel/discovery_anchor.tx rename to test/fixtures/crypto-material/channel-config/discovery_anchor.tx index 0e2042b198..94dfbc99f0 100644 Binary files a/test/fixtures/channel/discovery_anchor.tx and b/test/fixtures/crypto-material/channel-config/discovery_anchor.tx differ diff --git a/test/fixtures/channel/mychannel-org1anchor.tx b/test/fixtures/crypto-material/channel-config/mychannel-org1anchor.tx similarity index 100% rename from test/fixtures/channel/mychannel-org1anchor.tx rename to test/fixtures/crypto-material/channel-config/mychannel-org1anchor.tx diff --git a/test/scenario/config/crypto-config/mychannel.tx b/test/fixtures/crypto-material/channel-config/mychannel.tx similarity index 71% rename from test/scenario/config/crypto-config/mychannel.tx rename to test/fixtures/crypto-material/channel-config/mychannel.tx index 68876d9caa..742782c3b4 100644 Binary files a/test/scenario/config/crypto-config/mychannel.tx and b/test/fixtures/crypto-material/channel-config/mychannel.tx differ diff --git a/test/fixtures/channel/mychannel2.tx b/test/fixtures/crypto-material/channel-config/mychannel2.tx similarity index 77% rename from test/fixtures/channel/mychannel2.tx rename to test/fixtures/crypto-material/channel-config/mychannel2.tx index 28cab258ea..4b86bc8562 100644 Binary files a/test/fixtures/channel/mychannel2.tx and b/test/fixtures/crypto-material/channel-config/mychannel2.tx differ diff --git a/test/fixtures/channel/mychannelts.tx b/test/fixtures/crypto-material/channel-config/mychannelts.tx similarity index 78% rename from test/fixtures/channel/mychannelts.tx rename to test/fixtures/crypto-material/channel-config/mychannelts.tx index 313a8e80cc..1c9f2217d0 100644 Binary files a/test/fixtures/channel/mychannelts.tx and b/test/fixtures/crypto-material/channel-config/mychannelts.tx differ diff --git a/test/fixtures/channel/adminconfig.tx b/test/fixtures/crypto-material/channel-config/mychanneltx.tx similarity index 79% rename from test/fixtures/channel/adminconfig.tx rename to test/fixtures/crypto-material/channel-config/mychanneltx.tx index 54cf14cf46..6a3e1c3d45 100644 Binary files a/test/fixtures/channel/adminconfig.tx and b/test/fixtures/crypto-material/channel-config/mychanneltx.tx differ diff --git a/test/scenario/config/crypto-config/configtx.yaml b/test/fixtures/crypto-material/config-base/configtx.yaml similarity index 86% rename from test/scenario/config/crypto-config/configtx.yaml rename to test/fixtures/crypto-material/config-base/configtx.yaml index 08e9981046..c63e4228b2 100644 --- a/test/scenario/config/crypto-config/configtx.yaml +++ b/test/fixtures/crypto-material/config-base/configtx.yaml @@ -39,34 +39,20 @@ 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 for Channel is a catchall flag for behavior which has been - # determined to be desired for all orderers and peers running v1.0.x, - # but the modification of which would cause incompatibilities. Users - # should leave this flag set to true. 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 for Order is a catchall flag for behavior which has been - # determined to be desired for all orderers running v1.0.x, but the - # modification of which would cause incompatibilities. Users should - # leave this flag set to true. 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 for Application enables the new non-backwards compatible - # features and fixes of fabric v1.2, it implies V1_1. V1_2: true - # V1.1 for Application enables the new non-backwards compatible - # features and fixes of fabric v1.1 (note, this need not be set if - # V1_2 is set). V1_1: false - ################################################################################ # # CHANNEL @@ -186,7 +172,7 @@ Organizations: ID: OrdererMSP # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: crypto-config/ordererOrganizations/example.com/msp + 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 @@ -216,14 +202,7 @@ Organizations: # 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 + 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 @@ -253,14 +232,7 @@ Organizations: # 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: 7051 + 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 @@ -306,6 +278,7 @@ Profiles: - *Org1 - *Org2 TwoOrgsChannel: + <<: *ChannelDefaults Consortium: SampleConsortium Application: <<: *ApplicationDefaults diff --git a/test/fixtures/crypto-material/config-base/crypto-config.yaml b/test/fixtures/crypto-material/config-base/crypto-config.yaml new file mode 100755 index 0000000000..e132f5a94f --- /dev/null +++ b/test/fixtures/crypto-material/config-base/crypto-config.yaml @@ -0,0 +1,41 @@ +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +# --------------------------------------------------------------------------- +# "OrdererOrgs" - Definition of organizations managing orderer nodes +# --------------------------------------------------------------------------- +OrdererOrgs: + # --------------------------------------------------------------------------- + # Orderer + # --------------------------------------------------------------------------- + - Name: Orderer + Domain: example.com + # --------------------------------------------------------------------------- + # "Specs" - See PeerOrgs below for complete description + # --------------------------------------------------------------------------- + Specs: + - Hostname: orderer +# --------------------------------------------------------------------------- +# "PeerOrgs" - Definition of organizations managing peer nodes +# --------------------------------------------------------------------------- +PeerOrgs: + # --------------------------------------------------------------------------- + # Org1 + # --------------------------------------------------------------------------- + - Name: Org1 + Domain: org1.example.com + Template: + Count: 2 + Users: + Count: 1 + # --------------------------------------------------------------------------- + # Org2: See "Org1" for full specification + # --------------------------------------------------------------------------- + - Name: Org2 + Domain: org2.example.com + Template: + Count: 2 + Users: + Count: 1 diff --git a/test/fixtures/crypto-material/config-base/generate.sh b/test/fixtures/crypto-material/config-base/generate.sh new file mode 100755 index 0000000000..5d8a96304d --- /dev/null +++ b/test/fixtures/crypto-material/config-base/generate.sh @@ -0,0 +1,28 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# + +echo 'Deleting old *.tx items....' +rm -rf ../crypto-config +rm -rf ../channel-config +mkdir ../channel-config +mkdir ../crypto-config + +echo 'Generating base crypto-material and channel tx files....' +export FABRIC_CFG_PATH=$PWD +/Users/nkl/fabric/fabric-samples/bin/cryptogen generate --config=./crypto-config.yaml --output=../crypto-config +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ./twoorgs.genesis.block +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychannel.tx -channelID mychannel +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychannel2.tx -channelID mychannel2 #test/integration memory.js, network-config.js, +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychanneltx.tx -channelID mychanneltx #test/intergration/create-config-channel.js +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/mychannelts.tx -channelID mychannelts #test/typescript +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/adminconfig.tx -channelID adminconfig #test/integration/only-admin.js +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ../channel-config/discovery.tx -channelID discovery #test/integration/discovery.js, network-e2e + +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 + KEY_DIR=$(dirname ${KEY}) + mv ${KEY} ${KEY_DIR}/key.pem +done +echo 'Renaming keys complete' diff --git a/test/fixtures/crypto-material/config-base/twoorgs.genesis.block b/test/fixtures/crypto-material/config-base/twoorgs.genesis.block new file mode 100644 index 0000000000..24d28c64e9 Binary files /dev/null and b/test/fixtures/crypto-material/config-base/twoorgs.genesis.block differ diff --git a/test/fixtures/channel/configtx.yaml b/test/fixtures/crypto-material/config-update/configtx.yaml similarity index 91% rename from test/fixtures/channel/configtx.yaml rename to test/fixtures/crypto-material/config-update/configtx.yaml index d69559ff19..2a8784b7c4 100644 --- a/test/fixtures/channel/configtx.yaml +++ b/test/fixtures/crypto-material/config-update/configtx.yaml @@ -39,34 +39,20 @@ 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 for Channel is a catchall flag for behavior which has been - # determined to be desired for all orderers and peers running v1.0.x, - # but the modification of which would cause incompatibilities. Users - # should leave this flag set to true. 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 for Order is a catchall flag for behavior which has been - # determined to be desired for all orderers running v1.0.x, but the - # modification of which would cause incompatibilities. Users should - # leave this flag set to true. 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 for Application enables the new non-backwards compatible - # features and fixes of fabric v1.2, it implies V1_1. V1_2: true - # V1.1 for Application enables the new non-backwards compatible - # features and fixes of fabric v1.1 (note, this need not be set if - # V1_2 is set). V1_1: false - ################################################################################ # # CHANNEL @@ -186,7 +172,7 @@ Organizations: ID: OrdererMSP # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: crypto-config/ordererOrganizations/example.com/msp + 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 @@ -216,7 +202,7 @@ Organizations: # ID to load the MSP definition as ID: Org1MSP - MSPDir: crypto-config/peerOrganizations/org1.example.com/msp + MSPDir: ../crypto-config/peerOrganizations/org1.example.com/msp AnchorPeers: # AnchorPeers defines the location of peers which can be used @@ -253,7 +239,7 @@ Organizations: # ID to load the MSP definition as ID: Org2MSP - MSPDir: crypto-config/peerOrganizations/org2.example.com/msp + MSPDir: ../crypto-config/peerOrganizations/org2.example.com/msp AnchorPeers: # AnchorPeers defines the location of peers which can be used @@ -306,6 +292,7 @@ Profiles: - *Org1 - *Org2 TwoOrgsChannel: + <<: *ChannelDefaults Consortium: SampleConsortium Application: <<: *ApplicationDefaults diff --git a/test/fixtures/crypto-material/config-update/crypto-config.yaml b/test/fixtures/crypto-material/config-update/crypto-config.yaml new file mode 100755 index 0000000000..e132f5a94f --- /dev/null +++ b/test/fixtures/crypto-material/config-update/crypto-config.yaml @@ -0,0 +1,41 @@ +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +# --------------------------------------------------------------------------- +# "OrdererOrgs" - Definition of organizations managing orderer nodes +# --------------------------------------------------------------------------- +OrdererOrgs: + # --------------------------------------------------------------------------- + # Orderer + # --------------------------------------------------------------------------- + - Name: Orderer + Domain: example.com + # --------------------------------------------------------------------------- + # "Specs" - See PeerOrgs below for complete description + # --------------------------------------------------------------------------- + Specs: + - Hostname: orderer +# --------------------------------------------------------------------------- +# "PeerOrgs" - Definition of organizations managing peer nodes +# --------------------------------------------------------------------------- +PeerOrgs: + # --------------------------------------------------------------------------- + # Org1 + # --------------------------------------------------------------------------- + - Name: Org1 + Domain: org1.example.com + Template: + Count: 2 + Users: + Count: 1 + # --------------------------------------------------------------------------- + # Org2: See "Org1" for full specification + # --------------------------------------------------------------------------- + - Name: Org2 + Domain: org2.example.com + Template: + Count: 2 + Users: + Count: 1 diff --git a/test/fixtures/crypto-material/config-update/generate.sh b/test/fixtures/crypto-material/config-update/generate.sh new file mode 100755 index 0000000000..d5e10d4476 --- /dev/null +++ b/test/fixtures/crypto-material/config-update/generate.sh @@ -0,0 +1,9 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# + +echo 'Generating new channel update tx....' +export FABRIC_CFG_PATH=$PWD +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ../channel-config/mychannel-org1anchor.tx -channelID mychannel -asOrg Org1MSP +/Users/nkl/fabric/fabric-samples/bin/configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ../channel-config/discovery_anchor.tx -channelID discovery -asOrg Org1MSP + 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 new file mode 100644 index 0000000000..13f9948b4e --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICPTCCAeOgAwIBAgIQPtXvP24R2mRQGJs7y7P2RjAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowaTELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNkPA0VZH51MFwJWoUaBPvff92JY ++HIQEkwu+hd6QjIZb41GHtJS0wwb+/33gpHc4Y/V6ErMvkK9KjSuUGi0mOGjbTBr +MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw +DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg2ymzC5KUqGD4ajdvwcLfjixKyGLO +Ur0oz8/dgRVrTiEwCgYIKoZIzj0EAwIDSAAwRQIhAJukdb3wc4IgemUp9tpXUUyR +GFKUS3Hs8VQHKM9AkmTQAiAu85RIa3q271Ojj9PY3eaj6rJvRN/9zN5lvdbrdFy6 +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 new file mode 100644 index 0000000000..271684b2a4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/ca/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgu223SvTdqunnzyC9 +iTD+hsdZBJlVDkkCdcW/3Zd2RzShRANCAATZDwNFWR+dTBcCVqFGgT733/diWPhy +EBJMLvoXekIyGW+NRh7SUtMMG/v994KR3OGP1ehKzL5CvSo0rlBotJjh +-----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 new file mode 100644 index 0000000000..72246be34d --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICCTCCAbCgAwIBAgIQLOl6jv5Hi4iZhaQr3ubxRzAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowVjELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI +zj0DAQcDQgAEkowWkBflHHWS5rs+bK/VL7K/aBN1kaN1NiJdBkqbFHUSnfKwt3US +2pLlbywZploirqgjWWgjQLy+kxPilmL6waNNMEswDgYDVR0PAQH/BAQDAgeAMAwG +A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg2ymzC5KUqGD4ajdvwcLfjixKyGLOUr0o +z8/dgRVrTiEwCgYIKoZIzj0EAwIDRwAwRAIgT1Q6a8iTnKnDvBC98c5U+CrbAvgW +1kaRRDcwvS9zHFsCIGEncjtsxW9lVA5sK6NS1uV43lRpPfUUbdouKdslM/cZ +-----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 new file mode 100644 index 0000000000..13f9948b4e --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICPTCCAeOgAwIBAgIQPtXvP24R2mRQGJs7y7P2RjAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowaTELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNkPA0VZH51MFwJWoUaBPvff92JY ++HIQEkwu+hd6QjIZb41GHtJS0wwb+/33gpHc4Y/V6ErMvkK9KjSuUGi0mOGjbTBr +MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw +DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg2ymzC5KUqGD4ajdvwcLfjixKyGLO +Ur0oz8/dgRVrTiEwCgYIKoZIzj0EAwIDSAAwRQIhAJukdb3wc4IgemUp9tpXUUyR +GFKUS3Hs8VQHKM9AkmTQAiAu85RIa3q271Ojj9PY3eaj6rJvRN/9zN5lvdbrdFy6 +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 new file mode 100644 index 0000000000..d39d2516ea --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICQzCCAeqgAwIBAgIRAJnweMc3XVcics5qtstH7vgwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARozif0tK5bT0tHx7Y2 +rp84/CYbK2tguK0Q7sqGJWErHNtieeYvNcuxHEVxMfK4xCrPEwmQVAMELCPm/KfX +6LfCo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEII/ONyupU/jqzZgc6F4h +g5mze5ecYm6fiKHv0RjR0wkfMAoGCCqGSM49BAMCA0cAMEQCICKiC6eXMs/ZZgao +xZfKIEJUUER3kg62O3zHAgJLmHAMAiBW0hGn8/BwBLjEnmWoUn+Arga6dzc6hoCb +jW1I3PeZrg== +-----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 new file mode 100644 index 0000000000..72246be34d --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICCTCCAbCgAwIBAgIQLOl6jv5Hi4iZhaQr3ubxRzAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowVjELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI +zj0DAQcDQgAEkowWkBflHHWS5rs+bK/VL7K/aBN1kaN1NiJdBkqbFHUSnfKwt3US +2pLlbywZploirqgjWWgjQLy+kxPilmL6waNNMEswDgYDVR0PAQH/BAQDAgeAMAwG +A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg2ymzC5KUqGD4ajdvwcLfjixKyGLOUr0o +z8/dgRVrTiEwCgYIKoZIzj0EAwIDRwAwRAIgT1Q6a8iTnKnDvBC98c5U+CrbAvgW +1kaRRDcwvS9zHFsCIGEncjtsxW9lVA5sK6NS1uV43lRpPfUUbdouKdslM/cZ +-----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 new file mode 100644 index 0000000000..13f9948b4e --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICPTCCAeOgAwIBAgIQPtXvP24R2mRQGJs7y7P2RjAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowaTELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNkPA0VZH51MFwJWoUaBPvff92JY ++HIQEkwu+hd6QjIZb41GHtJS0wwb+/33gpHc4Y/V6ErMvkK9KjSuUGi0mOGjbTBr +MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw +DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg2ymzC5KUqGD4ajdvwcLfjixKyGLO +Ur0oz8/dgRVrTiEwCgYIKoZIzj0EAwIDSAAwRQIhAJukdb3wc4IgemUp9tpXUUyR +GFKUS3Hs8VQHKM9AkmTQAiAu85RIa3q271Ojj9PY3eaj6rJvRN/9zN5lvdbrdFy6 +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 new file mode 100644 index 0000000000..b1a3ddbacd --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/hvka2MB7wLx8Svc +pu+Ec0EsRp7+JaTt88FQL489Lv2hRANCAAT39lO+Hfhwi3AL0GzsQm0L8c3+/OQ3 +qcCULgKxv26swIMK8eu7t2Wt4oK1yPYUM7rwdxCU2AgK4hCWROAXz9ur +-----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 new file mode 100644 index 0000000000..9321285e2f --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICCzCCAbKgAwIBAgIQAPwWMnjt66uQXJB+cbjX7TAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowWDELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggq +hkjOPQMBBwNCAAT39lO+Hfhwi3AL0GzsQm0L8c3+/OQ3qcCULgKxv26swIMK8eu7 +t2Wt4oK1yPYUM7rwdxCU2AgK4hCWROAXz9uro00wSzAOBgNVHQ8BAf8EBAMCB4Aw +DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCDbKbMLkpSoYPhqN2/Bwt+OLErIYs5S +vSjPz92BFWtOITAKBggqhkjOPQQDAgNHADBEAiAm/w5vFm4KkvTqd3iGE/jZRS5A +s7E1MwpoR7LpsAaoHwIgJbh+fsnIOKpZUYAYl+iU58rlEUtib7ESsWz+JhIhdAI= +-----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 new file mode 100644 index 0000000000..d39d2516ea --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICQzCCAeqgAwIBAgIRAJnweMc3XVcics5qtstH7vgwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARozif0tK5bT0tHx7Y2 +rp84/CYbK2tguK0Q7sqGJWErHNtieeYvNcuxHEVxMfK4xCrPEwmQVAMELCPm/KfX +6LfCo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEII/ONyupU/jqzZgc6F4h +g5mze5ecYm6fiKHv0RjR0wkfMAoGCCqGSM49BAMCA0cAMEQCICKiC6eXMs/ZZgao +xZfKIEJUUER3kg62O3zHAgJLmHAMAiBW0hGn8/BwBLjEnmWoUn+Arga6dzc6hoCb +jW1I3PeZrg== +-----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 new file mode 100644 index 0000000000..d39d2516ea --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICQzCCAeqgAwIBAgIRAJnweMc3XVcics5qtstH7vgwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARozif0tK5bT0tHx7Y2 +rp84/CYbK2tguK0Q7sqGJWErHNtieeYvNcuxHEVxMfK4xCrPEwmQVAMELCPm/KfX +6LfCo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEII/ONyupU/jqzZgc6F4h +g5mze5ecYm6fiKHv0RjR0wkfMAoGCCqGSM49BAMCA0cAMEQCICKiC6eXMs/ZZgao +xZfKIEJUUER3kg62O3zHAgJLmHAMAiBW0hGn8/BwBLjEnmWoUn+Arga6dzc6hoCb +jW1I3PeZrg== +-----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 new file mode 100644 index 0000000000..2cc7754c14 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICWTCCAgCgAwIBAgIRAMslavifWanplRjdUcfH04AwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBaMFgxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0C +AQYIKoZIzj0DAQcDQgAEankxqS3U2j9ArHd0Q1C0bYm4eZ7j/N6+nYa7ITHVYCW2 +klc9CdDRecTv+p4g7rQCK7S5t6//e7bQGGK3SdCAs6OBljCBkzAOBgNVHQ8BAf8E +BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQC +MAAwKwYDVR0jBCQwIoAgj843K6lT+OrNmBzoXiGDmbN7l5xibp+Ioe/RGNHTCR8w +JwYDVR0RBCAwHoITb3JkZXJlci5leGFtcGxlLmNvbYIHb3JkZXJlcjAKBggqhkjO +PQQDAgNHADBEAiB6Q05N02r7O200mvQhSX/3Mg02N2kjWVQsbPyvHGZ0ggIgOCXw +PXArZimUrc+OOUGDGXYt99f0SyzHht3yfMofHoI= +-----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 new file mode 100644 index 0000000000..ca1b4c7800 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQghBsnkv4QKAOAzm/i +IewMJWcJzSz47It0CPyNrAjFjS6hRANCAARqeTGpLdTaP0Csd3RDULRtibh5nuP8 +3r6dhrshMdVgJbaSVz0J0NF5xO/6niDutAIrtLm3r/97ttAYYrdJ0ICz +-----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 new file mode 100644 index 0000000000..0c70b7f13e --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgy01x+/a5Dcd0F+J0 +LnFYA0DcsAcFfKQXTIYrHk68mfuhRANCAARozif0tK5bT0tHx7Y2rp84/CYbK2tg +uK0Q7sqGJWErHNtieeYvNcuxHEVxMfK4xCrPEwmQVAMELCPm/KfX6LfC +-----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 new file mode 100644 index 0000000000..d39d2516ea --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICQzCCAeqgAwIBAgIRAJnweMc3XVcics5qtstH7vgwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARozif0tK5bT0tHx7Y2 +rp84/CYbK2tguK0Q7sqGJWErHNtieeYvNcuxHEVxMfK4xCrPEwmQVAMELCPm/KfX +6LfCo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEII/ONyupU/jqzZgc6F4h +g5mze5ecYm6fiKHv0RjR0wkfMAoGCCqGSM49BAMCA0cAMEQCICKiC6eXMs/ZZgao +xZfKIEJUUER3kg62O3zHAgJLmHAMAiBW0hGn8/BwBLjEnmWoUn+Arga6dzc6hoCb +jW1I3PeZrg== +-----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 new file mode 100644 index 0000000000..72246be34d --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICCTCCAbCgAwIBAgIQLOl6jv5Hi4iZhaQr3ubxRzAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowVjELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI +zj0DAQcDQgAEkowWkBflHHWS5rs+bK/VL7K/aBN1kaN1NiJdBkqbFHUSnfKwt3US +2pLlbywZploirqgjWWgjQLy+kxPilmL6waNNMEswDgYDVR0PAQH/BAQDAgeAMAwG +A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg2ymzC5KUqGD4ajdvwcLfjixKyGLOUr0o +z8/dgRVrTiEwCgYIKoZIzj0EAwIDRwAwRAIgT1Q6a8iTnKnDvBC98c5U+CrbAvgW +1kaRRDcwvS9zHFsCIGEncjtsxW9lVA5sK6NS1uV43lRpPfUUbdouKdslM/cZ +-----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 new file mode 100644 index 0000000000..13f9948b4e --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICPTCCAeOgAwIBAgIQPtXvP24R2mRQGJs7y7P2RjAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowaTELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNkPA0VZH51MFwJWoUaBPvff92JY ++HIQEkwu+hd6QjIZb41GHtJS0wwb+/33gpHc4Y/V6ErMvkK9KjSuUGi0mOGjbTBr +MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw +DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg2ymzC5KUqGD4ajdvwcLfjixKyGLO +Ur0oz8/dgRVrTiEwCgYIKoZIzj0EAwIDSAAwRQIhAJukdb3wc4IgemUp9tpXUUyR +GFKUS3Hs8VQHKM9AkmTQAiAu85RIa3q271Ojj9PY3eaj6rJvRN/9zN5lvdbrdFy6 +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 new file mode 100644 index 0000000000..eb229b8a51 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgpY9uqTK0hwma0Jp0 +INX+OgVOhYezOypyWzqZGBeGX1uhRANCAASSjBaQF+UcdZLmuz5sr9Uvsr9oE3WR +o3U2Il0GSpsUdRKd8rC3dRLakuVvLBmmWiKuqCNZaCNAvL6TE+KWYvrB +-----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 new file mode 100644 index 0000000000..72246be34d --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIICCTCCAbCgAwIBAgIQLOl6jv5Hi4iZhaQr3ubxRzAKBggqhkjOPQQDAjBpMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w +bGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowVjELMAkGA1UE +BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz +Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI +zj0DAQcDQgAEkowWkBflHHWS5rs+bK/VL7K/aBN1kaN1NiJdBkqbFHUSnfKwt3US +2pLlbywZploirqgjWWgjQLy+kxPilmL6waNNMEswDgYDVR0PAQH/BAQDAgeAMAwG +A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg2ymzC5KUqGD4ajdvwcLfjixKyGLOUr0o +z8/dgRVrTiEwCgYIKoZIzj0EAwIDRwAwRAIgT1Q6a8iTnKnDvBC98c5U+CrbAvgW +1kaRRDcwvS9zHFsCIGEncjtsxW9lVA5sK6NS1uV43lRpPfUUbdouKdslM/cZ +-----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 new file mode 100644 index 0000000000..d39d2516ea --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICQzCCAeqgAwIBAgIRAJnweMc3XVcics5qtstH7vgwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARozif0tK5bT0tHx7Y2 +rp84/CYbK2tguK0Q7sqGJWErHNtieeYvNcuxHEVxMfK4xCrPEwmQVAMELCPm/KfX +6LfCo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEII/ONyupU/jqzZgc6F4h +g5mze5ecYm6fiKHv0RjR0wkfMAoGCCqGSM49BAMCA0cAMEQCICKiC6eXMs/ZZgao +xZfKIEJUUER3kg62O3zHAgJLmHAMAiBW0hGn8/BwBLjEnmWoUn+Arga6dzc6hoCb +jW1I3PeZrg== +-----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 new file mode 100644 index 0000000000..d39d2516ea --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICQzCCAeqgAwIBAgIRAJnweMc3XVcics5qtstH7vgwCgYIKoZIzj0EAwIwbDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l +eGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBaMGwxCzAJ +BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh +bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh +bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARozif0tK5bT0tHx7Y2 +rp84/CYbK2tguK0Q7sqGJWErHNtieeYvNcuxHEVxMfK4xCrPEwmQVAMELCPm/KfX +6LfCo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG +AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEII/ONyupU/jqzZgc6F4h +g5mze5ecYm6fiKHv0RjR0wkfMAoGCCqGSM49BAMCA0cAMEQCICKiC6eXMs/ZZgao +xZfKIEJUUER3kg62O3zHAgJLmHAMAiBW0hGn8/BwBLjEnmWoUn+Arga6dzc6hoCb +jW1I3PeZrg== +-----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 new file mode 100644 index 0000000000..a2b11b8cd1 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICKzCCAdKgAwIBAgIQeOiyKFDoPbmij9x2RL9m8TAKBggqhkjOPQQDAjBsMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 +YW1wbGUuY29tMB4XDTE5MDMwNTIxMjcwMFoXDTI5MDMwMjIxMjcwMFowVjELMAkG +A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu +Y2lzY28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYI +KoZIzj0DAQcDQgAEKhyw3U7e3IjGh4l+LaX5Cpfce5Ll5ibNNA2Bxht0s7ZHedWx +sfJqy5lMp0BAikYDwJIGoqa6imFSu9EMwMVjmKNsMGowDgYDVR0PAQH/BAQDAgWg +MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMCsG +A1UdIwQkMCKAII/ONyupU/jqzZgc6F4hg5mze5ecYm6fiKHv0RjR0wkfMAoGCCqG +SM49BAMCA0cAMEQCIF+g7Yfzv6L5mDIhyhWMSFWRta614qcae9lmcji5t8bmAiAp +JX31tyt7uy9xdMJPsfnXQR3w6sLJ8RW+95RJP2YdlA== +-----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 new file mode 100644 index 0000000000..f03f45c4e4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgrMqLw5fyYzWgCmNE +231Lvi+DoJpzygArx7F5DKtp+9uhRANCAAQqHLDdTt7ciMaHiX4tpfkKl9x7kuXm +Js00DYHGG3Sztkd51bGx8mrLmUynQECKRgPAkgaiprqKYVK70QzAxWOY +-----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 new file mode 100644 index 0000000000..f3157e4a3a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUjCCAfigAwIBAgIRAJAGeP51QLgVo4BfkGoqbLowCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE +AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA +BP/Kg4njbQnBb0p7bk5tcd+kmL28xNr2vjxXVzFxH8ch5wf8365gMOw5qhZ9nwpn +WJA/XjRhgeB1Gf9bepV0gnCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +kWuv+O8bazAYIAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDSAAw +RQIhAOPDBON2WkOvcGbXqdDzvFnqMYAnKixpnWIGbv5ZmDitAiBTkU7a/2yfQaoG +b3Ol7B/MbOxF3higCT0j1pEDRXv2rQ== +-----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 new file mode 100644 index 0000000000..17b3f78be0 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/SmWt6BSgkDnKihb +RAkGkZzOXWzU/g+k7wlx47hIF/+hRANCAAT/yoOJ420JwW9Ke25ObXHfpJi9vMTa +9r48V1cxcR/HIecH/N+uYDDsOaoWfZ8KZ1iQP140YYHgdRn/W3qVdIJw +-----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 new file mode 100644 index 0000000000..263faaeeca --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAMOttK3pBJvI8qHsh00q/9owCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEJFIfLHz52at0wfB5XB3WZ7qWkLeTwb +WQSFhJFgTiJjJivPshFg2CZ5gfwD3augPDlZbEsal0w1a02dbPM1JqijTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJFrr/jvG2sw +GCAKs6JbnV/vjeO8v+CSDripQHOGjbN4MAoGCCqGSM49BAMCA0gAMEUCIQDPsNRZ +ut/xhLW5RmOrCXP6wEbWQmzMgaINvGH/2HWhGgIgAW1BCXm5gnlEEeK+WnhSS/Ae +d4ebFW0PADjbr3Y3i6U= +-----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 new file mode 100644 index 0000000000..f3157e4a3a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUjCCAfigAwIBAgIRAJAGeP51QLgVo4BfkGoqbLowCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE +AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA +BP/Kg4njbQnBb0p7bk5tcd+kmL28xNr2vjxXVzFxH8ch5wf8365gMOw5qhZ9nwpn +WJA/XjRhgeB1Gf9bepV0gnCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +kWuv+O8bazAYIAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDSAAw +RQIhAOPDBON2WkOvcGbXqdDzvFnqMYAnKixpnWIGbv5ZmDitAiBTkU7a/2yfQaoG +b3Ol7B/MbOxF3higCT0j1pEDRXv2rQ== +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..263faaeeca --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAMOttK3pBJvI8qHsh00q/9owCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEJFIfLHz52at0wfB5XB3WZ7qWkLeTwb +WQSFhJFgTiJjJivPshFg2CZ5gfwD3augPDlZbEsal0w1a02dbPM1JqijTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJFrr/jvG2sw +GCAKs6JbnV/vjeO8v+CSDripQHOGjbN4MAoGCCqGSM49BAMCA0gAMEUCIQDPsNRZ +ut/xhLW5RmOrCXP6wEbWQmzMgaINvGH/2HWhGgIgAW1BCXm5gnlEEeK+WnhSS/Ae +d4ebFW0PADjbr3Y3i6U= +-----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 new file mode 100644 index 0000000000..f3157e4a3a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUjCCAfigAwIBAgIRAJAGeP51QLgVo4BfkGoqbLowCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE +AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA +BP/Kg4njbQnBb0p7bk5tcd+kmL28xNr2vjxXVzFxH8ch5wf8365gMOw5qhZ9nwpn +WJA/XjRhgeB1Gf9bepV0gnCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +kWuv+O8bazAYIAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDSAAw +RQIhAOPDBON2WkOvcGbXqdDzvFnqMYAnKixpnWIGbv5ZmDitAiBTkU7a/2yfQaoG +b3Ol7B/MbOxF3higCT0j1pEDRXv2rQ== +-----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 new file mode 100644 index 0000000000..321e9d5045 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgsDzhiZtzvG5mX8YZ +wNpb1L8+4SktYV4C89H/w+LGJF2hRANCAARQze00OX9ADIQba7aAeVbRHkKS0xmA +QvXNoBUHhPO6uwUxtMVJg8WloxHoD2Du1Z1uL9vvnEHJWDGtes9RbrNp +-----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 new file mode 100644 index 0000000000..5af046055f --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAcCgAwIBAgIRALprbom+8FK/jJY9MNhN9y8wCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMS5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABFDN7TQ5f0AMhBtrtoB5VtEeQpLTGYBC +9c2gFQeE87q7BTG0xUmDxaWjEegPYO7VnW4v2++cQclYMa16z1Fus2mjTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJFrr/jvG2sw +GCAKs6JbnV/vjeO8v+CSDripQHOGjbN4MAoGCCqGSM49BAMCA0cAMEQCIHH4ntmJ +H/mtONdpoY/Bf7A0MGXiQhX/GRPpXSwVw+sWAiBbFiSpUybCh0N/t0umIxBpFyfN +QrRkVu4HRz78U5cFlg== +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..8887bd3f5a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICZjCCAg2gAwIBAgIQHNM02Npp15skhsAWiAC57DAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcxLmV4YW1wbGUuY29t +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEopcEJ7NUD/yvtiTVCVcD272erMg0 +p9cyXZN1YLB5iL6DJ7MdG4Ru9TNAF32wI9yfjsyhMD6XbzPgNtTgeGAJiaOBlzCB +lDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC +MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgvJQBHbP2J34MS2JzPtbvHT9KHoxz +9r+CierrjG0fyMswKAYDVR0RBCEwH4IWcGVlcjAub3JnMS5leGFtcGxlLmNvbYIF +cGVlcjAwCgYIKoZIzj0EAwIDRwAwRAIgcoQYwcjWWd3bNTTmy3rgE23ihDpCzGcv +uYap1Zwv974CIA9w3ymGVp5ySzPw9wMAwe2fmMI5ZxG23VbeMICVEvmu +-----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 new file mode 100644 index 0000000000..971a42cc76 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgalACvCrBPTSZ7+cz +fdlo2zIIutztw8qsdrOc8yxm52OhRANCAASilwQns1QP/K+2JNUJVwPbvZ6syDSn +1zJdk3VgsHmIvoMnsx0bhG71M0AXfbAj3J+OzKEwPpdvM+A21OB4YAmJ +-----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 new file mode 100644 index 0000000000..263faaeeca --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAMOttK3pBJvI8qHsh00q/9owCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEJFIfLHz52at0wfB5XB3WZ7qWkLeTwb +WQSFhJFgTiJjJivPshFg2CZ5gfwD3augPDlZbEsal0w1a02dbPM1JqijTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJFrr/jvG2sw +GCAKs6JbnV/vjeO8v+CSDripQHOGjbN4MAoGCCqGSM49BAMCA0gAMEUCIQDPsNRZ +ut/xhLW5RmOrCXP6wEbWQmzMgaINvGH/2HWhGgIgAW1BCXm5gnlEEeK+WnhSS/Ae +d4ebFW0PADjbr3Y3i6U= +-----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 new file mode 100644 index 0000000000..f3157e4a3a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUjCCAfigAwIBAgIRAJAGeP51QLgVo4BfkGoqbLowCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE +AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA +BP/Kg4njbQnBb0p7bk5tcd+kmL28xNr2vjxXVzFxH8ch5wf8365gMOw5qhZ9nwpn +WJA/XjRhgeB1Gf9bepV0gnCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +kWuv+O8bazAYIAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDSAAw +RQIhAOPDBON2WkOvcGbXqdDzvFnqMYAnKixpnWIGbv5ZmDitAiBTkU7a/2yfQaoG +b3Ol7B/MbOxF3higCT0j1pEDRXv2rQ== +-----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 new file mode 100644 index 0000000000..8b725774e2 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgUQiWNpgTBPbngxLh +CtUiXCZJLvZptnjeaK9Bq7NvfEChRANCAASLjtVR/5vpms1G20a1YthgG31zE5uq +Ta2JkD4j1fe3yIYXbXRtvVWQqQEbya+zGaWHQcSOuC+SLyVpWD1e1SqK +-----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 new file mode 100644 index 0000000000..31ca88c4c3 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAM2uAMdplABImXfSeri859swCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMS5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABIuO1VH/m+mazUbbRrVi2GAbfXMTm6pN +rYmQPiPV97fIhhdtdG29VZCpARvJr7MZpYdBxI64L5IvJWlYPV7VKoqjTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJFrr/jvG2sw +GCAKs6JbnV/vjeO8v+CSDripQHOGjbN4MAoGCCqGSM49BAMCA0gAMEUCIQCIHtwy +KlypRi8r05kRO/g9c2N5m6iW+n3YA3sVEJtiJwIgQcGJNKZGy3ar15D7/6VSCG6r +I6b8iZDz0e5H9YCC5AU= +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..78b3fe76df --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICZzCCAg6gAwIBAgIRAOUBHRc1KGq/yKYXljlMMUAwCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMS5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABA/EKDZwBSD9vmp1QnthhoT+R68U +5aXtBbWazb8y3Zko9cpOpUtUz1AUQHfNpXCsRpz4B0mNIHywHK8RlwloHmyjgZcw +gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD +AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAILyUAR2z9id+DEticz7W7x0/Sh6M +c/a/gonq64xtH8jLMCgGA1UdEQQhMB+CFnBlZXIxLm9yZzEuZXhhbXBsZS5jb22C +BXBlZXIxMAoGCCqGSM49BAMCA0cAMEQCICWnut4ip9MtXClR6RiPWWQj0Arqq5Ct +9BZzbIpUQsmAAiAarBKEYasVCJbdTrgsWB/bzxX5tQPiQkPmWfQcdmIb7g== +-----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 new file mode 100644 index 0000000000..d05bad45ae --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgh4IRB1dGWSpOlht+ +45IaZxzvS0trwdRyH2TJSFlMbHKhRANCAAQPxCg2cAUg/b5qdUJ7YYaE/kevFOWl +7QW1ms2/Mt2ZKPXKTqVLVM9QFEB3zaVwrEac+AdJjSB8sByvEZcJaB5s +-----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 new file mode 100644 index 0000000000..24ebf68401 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg3vGJvIvz1OtlkyzI +/lc1hHFN7TKJF1KKXt3rOz8f84ShRANCAAQ5sI7yI/Ona1is7Z8R/cZtXgCI91nt +aHcTkhs9fB6+9A0s2E6zEuXEEB3RFYUDtKl2YLB5dcnVqtE1e/m82V5f +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..263faaeeca --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAMOttK3pBJvI8qHsh00q/9owCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEJFIfLHz52at0wfB5XB3WZ7qWkLeTwb +WQSFhJFgTiJjJivPshFg2CZ5gfwD3augPDlZbEsal0w1a02dbPM1JqijTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJFrr/jvG2sw +GCAKs6JbnV/vjeO8v+CSDripQHOGjbN4MAoGCCqGSM49BAMCA0gAMEUCIQDPsNRZ +ut/xhLW5RmOrCXP6wEbWQmzMgaINvGH/2HWhGgIgAW1BCXm5gnlEEeK+WnhSS/Ae +d4ebFW0PADjbr3Y3i6U= +-----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 new file mode 100644 index 0000000000..f3157e4a3a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUjCCAfigAwIBAgIRAJAGeP51QLgVo4BfkGoqbLowCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE +AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA +BP/Kg4njbQnBb0p7bk5tcd+kmL28xNr2vjxXVzFxH8ch5wf8365gMOw5qhZ9nwpn +WJA/XjRhgeB1Gf9bepV0gnCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +kWuv+O8bazAYIAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDSAAw +RQIhAOPDBON2WkOvcGbXqdDzvFnqMYAnKixpnWIGbv5ZmDitAiBTkU7a/2yfQaoG +b3Ol7B/MbOxF3higCT0j1pEDRXv2rQ== +-----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 new file mode 100644 index 0000000000..b751c82a7d --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgikQdQjBUxtdGFylR +b+ZB3mXyyjyHMGwseZZsujzojTehRANCAARCRSHyx8+dmrdMHweVwd1me6lpC3k8 +G1kEhYSRYE4iYyYrz7IRYNgmeYH8A92roDw5WWxLGpdMNWtNnWzzNSao +-----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 new file mode 100644 index 0000000000..263faaeeca --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAMOttK3pBJvI8qHsh00q/9owCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABEJFIfLHz52at0wfB5XB3WZ7qWkLeTwb +WQSFhJFgTiJjJivPshFg2CZ5gfwD3augPDlZbEsal0w1a02dbPM1JqijTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJFrr/jvG2sw +GCAKs6JbnV/vjeO8v+CSDripQHOGjbN4MAoGCCqGSM49BAMCA0gAMEUCIQDPsNRZ +ut/xhLW5RmOrCXP6wEbWQmzMgaINvGH/2HWhGgIgAW1BCXm5gnlEEeK+WnhSS/Ae +d4ebFW0PADjbr3Y3i6U= +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..82ff01bcc8 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICOjCCAeGgAwIBAgIQI2pWI1j+XbdItgEa0U9b5zAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29t +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEiDodz8xm/7rsCLRAqGZuDUWkDCdf +915XyF1msxQmxdmT9QErvKG3sM49rJIJPfNmsxwb7nxzAhBs1u4hFYyOy6NsMGow +DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM +BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAILyUAR2z9id+DEticz7W7x0/Sh6Mc/a/ +gonq64xtH8jLMAoGCCqGSM49BAMCA0cAMEQCIGs7hrUbr5tqKGVRMMF/Ku+ZNn4b +GMXnEU4W6151DUREAiBSH+ae+jNYQVsUYPdNIlA4YM20G7wqfIsKyBMJq+Ks6A== +-----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 new file mode 100644 index 0000000000..9336b48d93 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgaNy4P4XnIg9aQ50C +R78CrcCMQcsDwlOnY2KS1TihvPOhRANCAASIOh3PzGb/uuwItECoZm4NRaQMJ1/3 +XlfIXWazFCbF2ZP1ASu8obewzj2skgk982azHBvufHMCEGzW7iEVjI7L +-----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 new file mode 100644 index 0000000000..d9fd371508 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGDCCAb+gAwIBAgIQKbVF5oUcumdTlcdC9Ui8TTAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAElNNo95xtB83e7UOQTaoyonp3ZtfyMim+ +GGwifRkp408xLKFm704/ek5LUWgeXaUJrruftP7kJMGlcs7UFKuLBqNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgkWuv+O8bazAY +IAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDRwAwRAIgbPtbYIxB +PcbyQJ7Bby/CvJg1qPFlkUUf6dZY5TO4GVICIG0enFAv9BwdP0/Q1MyosQcaAeBo +BfzDHwHJIEQFXim9 +-----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 new file mode 100644 index 0000000000..f3157e4a3a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUjCCAfigAwIBAgIRAJAGeP51QLgVo4BfkGoqbLowCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBzMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UE +AxMTY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA +BP/Kg4njbQnBb0p7bk5tcd+kmL28xNr2vjxXVzFxH8ch5wf8365gMOw5qhZ9nwpn +WJA/XjRhgeB1Gf9bepV0gnCjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAU +BggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg +kWuv+O8bazAYIAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDSAAw +RQIhAOPDBON2WkOvcGbXqdDzvFnqMYAnKixpnWIGbv5ZmDitAiBTkU7a/2yfQaoG +b3Ol7B/MbOxF3higCT0j1pEDRXv2rQ== +-----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 new file mode 100644 index 0000000000..59726ae371 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgNta42Hs0ztd+9PNa +qBCvXhX34z/ap1+KkHfe2N/uY6mhRANCAASU02j3nG0Hzd7tQ5BNqjKiendm1/Iy +Kb4YbCJ9GSnjTzEsoWbvTj96TktRaB5dpQmuu5+0/uQkwaVyztQUq4sG +-----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 new file mode 100644 index 0000000000..d9fd371508 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGDCCAb+gAwIBAgIQKbVF5oUcumdTlcdC9Ui8TTAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAElNNo95xtB83e7UOQTaoyonp3ZtfyMim+ +GGwifRkp408xLKFm704/ek5LUWgeXaUJrruftP7kJMGlcs7UFKuLBqNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgkWuv+O8bazAY +IAqzoludX++N47y/4JIOuKlAc4aNs3gwCgYIKoZIzj0EAwIDRwAwRAIgbPtbYIxB +PcbyQJ7Bby/CvJg1qPFlkUUf6dZY5TO4GVICIG0enFAv9BwdP0/Q1MyosQcaAeBo +BfzDHwHJIEQFXim9 +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..83aaf8e5b4 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf2gAwIBAgIQWYwLWIEwAmMhCPn1boiNkjAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD +VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEObCO8iPzp2tYrO2fEf3GbV4AiPdZ7Wh3E5IbPXwevvQNLNhOsxLlxBAd +0RWFA7SpdmCweXXJ1arRNXv5vNleX6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud +JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud +DgQiBCC8lAEds/YnfgxLYnM+1u8dP0oejHP2v4KJ6uuMbR/IyzAKBggqhkjOPQQD +AgNIADBFAiEAwcjsEJVsFneVbsvzsJKSWwJI+TtttIFx1zKCesFhNXUCIFv+pQBh +Qr5oq5yBThjZhfJQ11XTkbIT3dL25bKkq57q +-----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 new file mode 100644 index 0000000000..8418eee153 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICOzCCAeGgAwIBAgIQS+V3WV6nFhG6ncaD597G8TAKBggqhkjOPQQDAjB2MQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz +Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3 +MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29t +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEzX2erYW9tz+Y3CSI5G5NSVNK4FXZ +Cou+EXRMssGpBRlxxp8G4d6f2gIg97QdXd/VaF4Pr26JTHTawpyQFSBil6NsMGow +DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM +BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAILyUAR2z9id+DEticz7W7x0/Sh6Mc/a/ +gonq64xtH8jLMAoGCCqGSM49BAMCA0gAMEUCIQDb+oTYBCQbOTiVAZ5mHLljRtZQ +qX7F7tVZKaFRnFTh0wIgCvwrKNWr19w2Si3sOpaR76zCbxKCqw7oSxNNM+z9f90= +-----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 new file mode 100644 index 0000000000..c77382150a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgh1ifVjbHdXaaAKLf +qb2UjswtqM8lri5L4v+L1WeX4DahRANCAATNfZ6thb23P5jcJIjkbk1JU0rgVdkK +i74RdEyywakFGXHGnwbh3p/aAiD3tB1d39VoXg+vbolMdNrCnJAVIGKX +-----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 new file mode 100644 index 0000000000..a4c6eee633 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUDCCAfegAwIBAgIQTMbA4KuaIFrVodHNfsxFgjAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD +ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE +YMexaHECom0fnd2kqiSK0oT4ryMUt4qvJBllPdFn5ulqC226kVhxtS6YEVqMPMAM +yJ2h3YdoEFI279uDSSRnmqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG +CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBa +rULTcTH+XrsFK+F7yioml8ZWuY2O/BdDJ9/ZEtkE9zAKBggqhkjOPQQDAgNHADBE +AiAUe85Rc+dNIHRT5+s/wz/bkNIYtOeLCyoIZwsTRoez8QIgWJkFmIlTDmKAkDEz +pUwLHlP4NwbaZsCAaFCnn091Cmw= +-----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 new file mode 100644 index 0000000000..6a27d98c8a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgBxHZD3gevWSf4Z3+ +qpwTyMSae+MI9EfqiQGuuQxtazGhRANCAARgx7FocQKibR+d3aSqJIrShPivIxS3 +iq8kGWU90Wfm6WoLbbqRWHG1LpgRWow8wAzInaHdh2gQUjbv24NJJGea +-----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 new file mode 100644 index 0000000000..48ce1f6624 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAb+gAwIBAgIQBMhV7OY60+XQuJZxe0q51zAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEN9mxoMsSzNtl8e7gM510QUU7ZW8fj5av +sc4f7cCzFsvfpXF+ZPglgZOV4FrajEEzUrjo2n3Q5/Gh8QjPbIH4aaNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgWq1C03Ex/l67 +BSvhe8oqJpfGVrmNjvwXQyff2RLZBPcwCgYIKoZIzj0EAwIDSAAwRQIhANwTz3yY +gOx1G4gnuegQY3/zL/NKFUjNmzhwMsRrjNM1AiAPQgBPieUq/fQeHw+UNUkhSoAz +MJAw4L6y05zfjj2Neg== +-----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 new file mode 100644 index 0000000000..a4c6eee633 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUDCCAfegAwIBAgIQTMbA4KuaIFrVodHNfsxFgjAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD +ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE +YMexaHECom0fnd2kqiSK0oT4ryMUt4qvJBllPdFn5ulqC226kVhxtS6YEVqMPMAM +yJ2h3YdoEFI279uDSSRnmqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG +CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBa +rULTcTH+XrsFK+F7yioml8ZWuY2O/BdDJ9/ZEtkE9zAKBggqhkjOPQQDAgNHADBE +AiAUe85Rc+dNIHRT5+s/wz/bkNIYtOeLCyoIZwsTRoez8QIgWJkFmIlTDmKAkDEz +pUwLHlP4NwbaZsCAaFCnn091Cmw= +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..48ce1f6624 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAb+gAwIBAgIQBMhV7OY60+XQuJZxe0q51zAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEN9mxoMsSzNtl8e7gM510QUU7ZW8fj5av +sc4f7cCzFsvfpXF+ZPglgZOV4FrajEEzUrjo2n3Q5/Gh8QjPbIH4aaNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgWq1C03Ex/l67 +BSvhe8oqJpfGVrmNjvwXQyff2RLZBPcwCgYIKoZIzj0EAwIDSAAwRQIhANwTz3yY +gOx1G4gnuegQY3/zL/NKFUjNmzhwMsRrjNM1AiAPQgBPieUq/fQeHw+UNUkhSoAz +MJAw4L6y05zfjj2Neg== +-----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 new file mode 100644 index 0000000000..a4c6eee633 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUDCCAfegAwIBAgIQTMbA4KuaIFrVodHNfsxFgjAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD +ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE +YMexaHECom0fnd2kqiSK0oT4ryMUt4qvJBllPdFn5ulqC226kVhxtS6YEVqMPMAM +yJ2h3YdoEFI279uDSSRnmqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG +CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBa +rULTcTH+XrsFK+F7yioml8ZWuY2O/BdDJ9/ZEtkE9zAKBggqhkjOPQQDAgNHADBE +AiAUe85Rc+dNIHRT5+s/wz/bkNIYtOeLCyoIZwsTRoez8QIgWJkFmIlTDmKAkDEz +pUwLHlP4NwbaZsCAaFCnn091Cmw= +-----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 new file mode 100644 index 0000000000..f4f66bfe27 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgoqfPvQDy1JCXo0U5 +ELZnzApbuYp+vzchxeQzuFQDff6hRANCAAQqL7hzq46IYxEdwRF0brk007wWjbTF +cX3on7Me2LOQPGn2DlS7Y3OqS9UCGthRwKU7Zn76+3PWYrBNOSYHPquZ +-----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 new file mode 100644 index 0000000000..400e72d3fe --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAb+gAwIBAgIQeKC0HI38/2hiKhdQ7s47nTAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcyLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKi+4c6uOiGMRHcERdG65NNO8Fo20xXF9 +6J+zHtizkDxp9g5Uu2NzqkvVAhrYUcClO2Z++vtz1mKwTTkmBz6rmaNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgWq1C03Ex/l67 +BSvhe8oqJpfGVrmNjvwXQyff2RLZBPcwCgYIKoZIzj0EAwIDSAAwRQIhAPChthll +Z0XWI/eMYrdp8La1uUWfmcPwuTT90CjqI4tRAiB/oeIF8IwEFsqPOWlS4EYS7huO +ZgxZVjTFciHDWE4jtA== +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..6235e58562 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICaDCCAg6gAwIBAgIRAMNCQ1mUb3NDcYk7QDeueDIwCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMi5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABA1T0cPd5rvmGFgmqfwaAWQXlTQ/ +iGsbhjp0akdTZXayyfZNa2ahMdiVPb/olzQH2BzOhU7GYcgrl8WHC1U4s4ijgZcw +gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD +AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIKEk65VbbmgGLfjANTe0XuYjfx4l +LenvD5eKoY8OcFImMCgGA1UdEQQhMB+CFnBlZXIwLm9yZzIuZXhhbXBsZS5jb22C +BXBlZXIwMAoGCCqGSM49BAMCA0gAMEUCIQDMmev65m0sy0msO3orcdpV4Q0bNSao +21gBgouTr47XRAIgeatVVGO79+xzbfIu3vJedO8jveBtZGFA7n0U3Ypfky0= +-----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 new file mode 100644 index 0000000000..9404024f39 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgaF9c5mPiKMs0Ipjr +1yQh4D7KPLfNihhg3SayjHrOUUuhRANCAAQNU9HD3ea75hhYJqn8GgFkF5U0P4hr +G4Y6dGpHU2V2ssn2TWtmoTHYlT2/6Jc0B9gczoVOxmHIK5fFhwtVOLOI +-----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 new file mode 100644 index 0000000000..48ce1f6624 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAb+gAwIBAgIQBMhV7OY60+XQuJZxe0q51zAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEN9mxoMsSzNtl8e7gM510QUU7ZW8fj5av +sc4f7cCzFsvfpXF+ZPglgZOV4FrajEEzUrjo2n3Q5/Gh8QjPbIH4aaNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgWq1C03Ex/l67 +BSvhe8oqJpfGVrmNjvwXQyff2RLZBPcwCgYIKoZIzj0EAwIDSAAwRQIhANwTz3yY +gOx1G4gnuegQY3/zL/NKFUjNmzhwMsRrjNM1AiAPQgBPieUq/fQeHw+UNUkhSoAz +MJAw4L6y05zfjj2Neg== +-----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 new file mode 100644 index 0000000000..a4c6eee633 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUDCCAfegAwIBAgIQTMbA4KuaIFrVodHNfsxFgjAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD +ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE +YMexaHECom0fnd2kqiSK0oT4ryMUt4qvJBllPdFn5ulqC226kVhxtS6YEVqMPMAM +yJ2h3YdoEFI279uDSSRnmqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG +CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBa +rULTcTH+XrsFK+F7yioml8ZWuY2O/BdDJ9/ZEtkE9zAKBggqhkjOPQQDAgNHADBE +AiAUe85Rc+dNIHRT5+s/wz/bkNIYtOeLCyoIZwsTRoez8QIgWJkFmIlTDmKAkDEz +pUwLHlP4NwbaZsCAaFCnn091Cmw= +-----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 new file mode 100644 index 0000000000..5afa55e5de --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgmySyVHfvH6bP9zoS +HbVzrICTEnEbNBLZ25FmoVR38dmhRANCAAQUHkE0NYXlQro5F7xytqbq7GE+cLQa +buMe6utfurAhZNZyYdsK6y35bYuG76fBrhV2jGgBnRjRblfR2cNuOM5Z +-----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 new file mode 100644 index 0000000000..f2bf2fda50 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAJ+JLtqurWx55luUtNgqXpswCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMi5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABBQeQTQ1heVCujkXvHK2pursYT5wtBpu +4x7q61+6sCFk1nJh2wrrLflti4bvp8GuFXaMaAGdGNFuV9HZw244zlmjTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIFqtQtNxMf5e +uwUr4XvKKiaXxla5jY78F0Mn39kS2QT3MAoGCCqGSM49BAMCA0gAMEUCIQC2LJmA +X46eY6DfVVU9P43c5uKxB4LpibLL+/YwHyF/aAIgZETYWOgrwwyL+tn7teLs9edU +pzpwNNBNu9qLt+ZR7f4= +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..feadefffa1 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICaDCCAg6gAwIBAgIRAMoyUqDj7j0aNwnZPl/vzrwwCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMi5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABBx6e0AZqta01ltWg0vnEIYFRYfb +CkMcjzesYWOOWXDPlH40o7JzpwBU2srSQUnm3yd54572k8r/F7Si/Umi8CCjgZcw +gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD +AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIKEk65VbbmgGLfjANTe0XuYjfx4l +LenvD5eKoY8OcFImMCgGA1UdEQQhMB+CFnBlZXIxLm9yZzIuZXhhbXBsZS5jb22C +BXBlZXIxMAoGCCqGSM49BAMCA0gAMEUCIQCYvi9n106Vvl7OMsimXk9sRBAflo79 +W4FpR2Ff0jvW5gIgZrC2aLzxJ/ZuC/r7VGs51+FNH9fGTfiYEYAoo8c+6vY= +-----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 new file mode 100644 index 0000000000..a03f738519 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgdOeouK0Wi5PrcgUq +K9eAoDRWPFpUjo3imUOqUj+2L/ihRANCAAQcentAGarWtNZbVoNL5xCGBUWH2wpD +HI83rGFjjllwz5R+NKOyc6cAVNrK0kFJ5t8neeOe9pPK/xe0ov1JovAg +-----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 new file mode 100644 index 0000000000..424a3698c9 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgbUohXDMizly90dQQ +OqaUEBbdOo3ry3QcuM/17ZtzFOahRANCAAR1558FLv8LOgZH9L17UIKYF4YSFeRp +t/8orDwd0jb8mXkezkxBqhejO+0j46fmFwxDKBcCkzZC3MFBKrpHfz9X +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..48ce1f6624 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAb+gAwIBAgIQBMhV7OY60+XQuJZxe0q51zAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEN9mxoMsSzNtl8e7gM510QUU7ZW8fj5av +sc4f7cCzFsvfpXF+ZPglgZOV4FrajEEzUrjo2n3Q5/Gh8QjPbIH4aaNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgWq1C03Ex/l67 +BSvhe8oqJpfGVrmNjvwXQyff2RLZBPcwCgYIKoZIzj0EAwIDSAAwRQIhANwTz3yY +gOx1G4gnuegQY3/zL/NKFUjNmzhwMsRrjNM1AiAPQgBPieUq/fQeHw+UNUkhSoAz +MJAw4L6y05zfjj2Neg== +-----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 new file mode 100644 index 0000000000..a4c6eee633 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUDCCAfegAwIBAgIQTMbA4KuaIFrVodHNfsxFgjAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD +ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE +YMexaHECom0fnd2kqiSK0oT4ryMUt4qvJBllPdFn5ulqC226kVhxtS6YEVqMPMAM +yJ2h3YdoEFI279uDSSRnmqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG +CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBa +rULTcTH+XrsFK+F7yioml8ZWuY2O/BdDJ9/ZEtkE9zAKBggqhkjOPQQDAgNHADBE +AiAUe85Rc+dNIHRT5+s/wz/bkNIYtOeLCyoIZwsTRoez8QIgWJkFmIlTDmKAkDEz +pUwLHlP4NwbaZsCAaFCnn091Cmw= +-----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 new file mode 100644 index 0000000000..7b3f9eec33 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8mEx5nmcWrfCnGs2 +fUS2y5WFr/s+QSJPV7zAjvObFcihRANCAAQ32bGgyxLM22Xx7uAznXRBRTtlbx+P +lq+xzh/twLMWy9+lcX5k+CWBk5XgWtqMQTNSuOjafdDn8aHxCM9sgfhp +-----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 new file mode 100644 index 0000000000..48ce1f6624 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAb+gAwIBAgIQBMhV7OY60+XQuJZxe0q51zAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEN9mxoMsSzNtl8e7gM510QUU7ZW8fj5av +sc4f7cCzFsvfpXF+ZPglgZOV4FrajEEzUrjo2n3Q5/Gh8QjPbIH4aaNNMEswDgYD +VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgWq1C03Ex/l67 +BSvhe8oqJpfGVrmNjvwXQyff2RLZBPcwCgYIKoZIzj0EAwIDSAAwRQIhANwTz3yY +gOx1G4gnuegQY3/zL/NKFUjNmzhwMsRrjNM1AiAPQgBPieUq/fQeHw+UNUkhSoAz +MJAw4L6y05zfjj2Neg== +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..b4bc761219 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICOzCCAeKgAwIBAgIRAJG7BkgFDelrlH/XJI7JmBUwCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMi5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAVrOfcuR4rYvFPdiQj9yjFR+fCN +n/qySK0oHKVVgHVTZzE3QQUwe5v0DQDFF3f6yYNUqsJAuRwVM1LxYbBA7N6jbDBq +MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw +DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCChJOuVW25oBi34wDU3tF7mI38eJS3p +7w+XiqGPDnBSJjAKBggqhkjOPQQDAgNHADBEAiAhc0LAfHV2ez9Kfu2uiXZsw5kf +5yUT3Z8uWBvcjMQTQgIgY1Cd47jYWO1hwERuRk5edG3N6ZA5ZqzqkESw8lfPoGw= +-----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 new file mode 100644 index 0000000000..7b0e2e928e --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzYOqGMdwAaqfRnrC +22kTvXnVLcrCROK0GoajgURK7bKhRANCAAQFazn3LkeK2LxT3YkI/coxUfnwjZ/6 +skitKBylVYB1U2cxN0EFMHub9A0AxRd3+smDVKrCQLkcFTNS8WGwQOze +-----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 new file mode 100644 index 0000000000..6c29ef9694 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAJFBO00l6jF5Bar77o307SMwCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMi5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABKi6C3MkknUF0ocsqEx3shFsc9IuNlZb +V5Dc05cmlQv4/GNghdbgWNjdpS/ZwdOmHD/GEJ7mr/UhDRJ+ecxE3KOjTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIFqtQtNxMf5e +uwUr4XvKKiaXxla5jY78F0Mn39kS2QT3MAoGCCqGSM49BAMCA0gAMEUCIQCkgsmN +NAElJd4VLNRd36227DvCeZxDOCajNL2FwkwQnAIgRmZ4CjOlwrhrmVJwz3b6WbN8 +X5JFD2uKMibJyBIg1rc= +-----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 new file mode 100644 index 0000000000..a4c6eee633 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUDCCAfegAwIBAgIQTMbA4KuaIFrVodHNfsxFgjAKBggqhkjOPQQDAjBzMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy +YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu +b3JnMi5leGFtcGxlLmNvbTAeFw0xOTAzMDUyMTI3MDBaFw0yOTAzMDIyMTI3MDBa +MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T +YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD +ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE +YMexaHECom0fnd2kqiSK0oT4ryMUt4qvJBllPdFn5ulqC226kVhxtS6YEVqMPMAM +yJ2h3YdoEFI279uDSSRnmqNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG +CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBa +rULTcTH+XrsFK+F7yioml8ZWuY2O/BdDJ9/ZEtkE9zAKBggqhkjOPQQDAgNHADBE +AiAUe85Rc+dNIHRT5+s/wz/bkNIYtOeLCyoIZwsTRoez8QIgWJkFmIlTDmKAkDEz +pUwLHlP4NwbaZsCAaFCnn091Cmw= +-----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 new file mode 100644 index 0000000000..af010c2935 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgHu9eqyC6MLA49fN+ ++xVdnpm4O3EvwZvNTrrEiJ5GziChRANCAASougtzJJJ1BdKHLKhMd7IRbHPSLjZW +W1eQ3NOXJpUL+PxjYIXW4FjY3aUv2cHTphw/xhCe5q/1IQ0SfnnMRNyj +-----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 new file mode 100644 index 0000000000..6c29ef9694 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGjCCAcCgAwIBAgIRAJFBO00l6jF5Bar77o307SMwCgYIKoZIzj0EAwIwczEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh +Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEyNzAw +WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN +U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMi5leGFtcGxlLmNvbTBZ +MBMGByqGSM49AgEGCCqGSM49AwEHA0IABKi6C3MkknUF0ocsqEx3shFsc9IuNlZb +V5Dc05cmlQv4/GNghdbgWNjdpS/ZwdOmHD/GEJ7mr/UhDRJ+ecxE3KOjTTBLMA4G +A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIFqtQtNxMf5e +uwUr4XvKKiaXxla5jY78F0Mn39kS2QT3MAoGCCqGSM49BAMCA0gAMEUCIQCkgsmN +NAElJd4VLNRd36227DvCeZxDOCajNL2FwkwQnAIgRmZ4CjOlwrhrmVJwz3b6WbN8 +X5JFD2uKMibJyBIg1rc= +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..768e04691a --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICVzCCAf6gAwIBAgIRAKyelf8lFQLuzJuLYbVRO+0wCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G +A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABHXnnwUu/ws6Bkf0vXtQgpgXhhIV5Gm3/yisPB3SNvyZeR7OTEGqF6M7 +7SPjp+YXDEMoFwKTNkLcwUEqukd/P1ejbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV +HQ4EIgQgoSTrlVtuaAYt+MA1N7Re5iN/HiUt6e8Pl4qhjw5wUiYwCgYIKoZIzj0E +AwIDRwAwRAIgL5WjiTRKAnotwix/lvv9zWfHwFLTyWXfsz6Boqfi2osCIC1DLwaH +eMk/UJbz0eSmzRFYOh6duNmr1vYOxHrKdAKI +-----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 new file mode 100644 index 0000000000..f476c407ee --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICPDCCAeKgAwIBAgIRAI8fx3A4KLU+8wEy+Sbr2sUwCgYIKoZIzj0EAwIwdjEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG +cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs +c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTkwMzA1MjEyNzAwWhcNMjkwMzAyMjEy +NzAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMi5leGFtcGxlLmNv +bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKeeE4CW//jYdXyaH4I1IXyGNlfd +Wtaj+vCnfVQU7wquhOw5XQ4sRa9s6U6K9Ocdx4jiaHroCnOla3PgnSTuYmSjbDBq +MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw +DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCChJOuVW25oBi34wDU3tF7mI38eJS3p +7w+XiqGPDnBSJjAKBggqhkjOPQQDAgNIADBFAiEA/9GI1fOV1qp35Vm8oXgjOXVC +NfdMoC+B7vxKTjQb3pACIC6MQuyGjTWQKP1ZQZuhDhsMja/y4wGCg9tk8k7Qc0au +-----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 new file mode 100644 index 0000000000..30a89c8d94 --- /dev/null +++ b/test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgWhqysDLSQmKgpILf +MlMh8KOaLKU7VmOkw/0O8O/mmf+hRANCAASnnhOAlv/42HV8mh+CNSF8hjZX3VrW +o/rwp31UFO8KroTsOV0OLEWvbOlOivTnHceI4mh66ApzpWtz4J0k7mJk +-----END PRIVATE KEY----- diff --git a/test/fixtures/crypto-material/generateAll.sh b/test/fixtures/crypto-material/generateAll.sh new file mode 100755 index 0000000000..e9f3d39e35 --- /dev/null +++ b/test/fixtures/crypto-material/generateAll.sh @@ -0,0 +1,12 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# + +# One generate file to rule them all + +cd ./config-base +./generate.sh +cd ../config-update +./generate.sh + + diff --git a/test/fixtures/channel/mychannelator.json b/test/fixtures/crypto-material/mychannelator.json similarity index 100% rename from test/fixtures/channel/mychannelator.json rename to test/fixtures/crypto-material/mychannelator.json diff --git a/test/fixtures/crypto-material/v2/configtx.yaml b/test/fixtures/crypto-material/v2/configtx.yaml new file mode 100644 index 0000000000..a95fcb95fc --- /dev/null +++ b/test/fixtures/crypto-material/v2/configtx.yaml @@ -0,0 +1,296 @@ +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +################################################################################ +# +# SECTION: Application +# +# - This section defines the values to encode into a config transaction or +# genesis block for application related parameters +# +################################################################################ +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" +################################################################################ +# +# SECTION: Capabilities +################################################################################ +Capabilities: + Channel: &ChannelCapabilities + V2_0: true + + Orderer: &OrdererCapabilities + V2_0: true + + Application: &ApplicationCapabilities + V2_0: true + +################################################################################ +# +# CHANNEL +# +# This section defines the values to encode into a config transaction or +# genesis block for channel related parameters. +# +################################################################################ +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 + + +################################################################################ +# +# SECTION: Orderer +# +# - This section defines the values to encode into a config transaction or +# genesis block for orderer related parameters +# +################################################################################ +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" + +################################################################################ +# +# Section: Organizations +# +# - This section defines the different organizational identities which will +# be referenced later in the configuration. +# +################################################################################ +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')" + +################################################################################ +# +# Profile +# +# - Different configuration profiles may be encoded here to be specified +# as parameters to the configtxgen tool +# +################################################################################ +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 + diff --git a/test/fixtures/channel/mychannel.tx b/test/fixtures/crypto-material/v2/tokenchannel.tx similarity index 79% rename from test/fixtures/channel/mychannel.tx rename to test/fixtures/crypto-material/v2/tokenchannel.tx index 68876d9caa..7babcac6c2 100644 Binary files a/test/fixtures/channel/mychannel.tx and b/test/fixtures/crypto-material/v2/tokenchannel.tx differ diff --git a/test/fixtures/docker-compose-marbles.yml b/test/fixtures/docker-compose-marbles.yml deleted file mode 100644 index ae7fe42710..0000000000 --- a/test/fixtures/docker-compose-marbles.yml +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# -orderer: - image: hyperledger/fabric-orderer - environment: - - ORDERER_GENERAL_LEDGERTYPE=ram - - ORDERER_GENERAL_BATCHTIMEOUT=10s - - ORDERER_GENERAL_MAXMESSAGECOUNT=2 - - ORDERER_GENERAL_MAXWINDOWSIZE=1000 - - ORDERER_GENERAL_ORDERERTYPE=solo - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_RAMLEDGER_HISTORY_SIZE=100 - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer - command: orderer - ports: - - 7050:7050 - -couchdb0: - image: klaemo/couchdb:2.0.0 - command: tini -- /docker-entrypoint.sh /opt/couchdb/bin/couchdb - ports: - - 5984:5984 - -couchdb1: - image: klaemo/couchdb:2.0.0 - command: tini -- /docker-entrypoint.sh /opt/couchdb/bin/couchdb - -vp0: - image: hyperledger/fabric-peer - environment: - - CORE_PEER_ADDRESSAUTODETECT=true - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_PEER_NETWORKID=${CORE_PEER_ID} - - CORE_NEXT=true - - CORE_PEER_ENDORSER_ENABLED=true - - CORE_PEER_COMMITTER_ENABLED=true - - CORE_PEER_ID=vp0 - - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:7050 - - CORE_PEER_GOSSIP_ORGLEADER=true - - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb0:5984 - volumes: - - /var/run/:/host/var/run/ - ports: - - 7051:7051 - links: - - orderer - - couchdb0 - -vp1: - image: hyperledger/fabric-peer - environment: - - CORE_PEER_ADDRESSAUTODETECT=true - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_PEER_NETWORKID=${CORE_PEER_ID} - - CORE_NEXT=true - - CORE_PEER_ENDORSER_ENABLED=true - - CORE_PEER_COMMITTER_ENABLED=true - - CORE_PEER_ID=vp1 - - CORE_PEER_GOSSIP_BOOTSTRAP=vp0:7051 - - CORE_PEER_GOSSIP_ORGLEADER=false - - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb1:5984 - volumes: - - /var/run/:/host/var/run/ - ports: - - 7056:7051 - links: - - vp0 - - couchdb1 diff --git a/test/fixtures/docker-compose.yaml b/test/fixtures/docker-compose.yaml deleted file mode 100644 index cf415a5c71..0000000000 --- a/test/fixtures/docker-compose.yaml +++ /dev/null @@ -1,143 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# -version: '2' - -services: - ca0: - image: hyperledger/fabric-ca${DOCKER_IMG_TAG} - environment: - - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - - FABRIC_CA_SERVER_CA_NAME=ca-org1 - - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org1.example.com-cert.pem - - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/a22daf356b2aab5792ea53e35f66fccef1d7f1aa2b3a2b92dbfbf96a448ea26a_sk - - FABRIC_CA_SERVER_TLS_ENABLED=true - - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org1.example.com-cert.pem - - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/a22daf356b2aab5792ea53e35f66fccef1d7f1aa2b3a2b92dbfbf96a448ea26a_sk - ports: - - "7054:7054" - command: sh -c 'fabric-ca-server start --cfg.identities.allowremove --cfg.affiliations.allowremove -b admin:adminpw -d' - volumes: - - ./channel/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config - container_name: ca_peerOrg1 - - ca1: - image: hyperledger/fabric-ca${DOCKER_IMG_TAG} - environment: - - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - - FABRIC_CA_SERVER_CA_NAME=ca-org2 - - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org2.example.com-cert.pem - - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/464d550fe9bf9e7d8976cdf59d1a5d472598f54c058c3546317c5c5fb0ddfd6e_sk - - FABRIC_CA_SERVER_TLS_ENABLED=true - - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org2.example.com-cert.pem - - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/464d550fe9bf9e7d8976cdf59d1a5d472598f54c058c3546317c5c5fb0ddfd6e_sk - ports: - - "8054:7054" - command: sh -c 'fabric-ca-server start -b admin:adminpw -d' - volumes: - - ./channel/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config - container_name: ca_peerOrg2 - - orderer.example.com: - container_name: orderer.example.com - image: hyperledger/fabric-orderer${DOCKER_IMG_TAG} - environment: - - ORDERER_GENERAL_LOGLEVEL=debug - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/etc/hyperledger/configtx/twoorgs.genesis.block - - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - - ORDERER_GENERAL_LOCALMSPDIR=/etc/hyperledger/msp/orderer - - ORDERER_GENERAL_TLS_ENABLED=true - - ORDERER_GENERAL_TLS_CLIENTAUTHREQUIRED=true - - ORDERER_GENERAL_TLS_PRIVATEKEY=/etc/hyperledger/msp/orderer/keystore/e8a4fdaacf1ef1d925686f19f56eb558b6c71f0116d85916299fc1368de2d58a_sk - - ORDERER_GENERAL_TLS_CERTIFICATE=/etc/hyperledger/msp/orderer/signcerts/orderer.example.com-cert.pem - - ORDERER_GENERAL_TLS_ROOTCAS=[/etc/hyperledger/msp/orderer/cacerts/example.com-cert.pem, /etc/hyperledger/msp/peerOrg1/cacerts/org1.example.com-cert.pem, /etc/hyperledger/msp/peerOrg2/cacerts/org2.example.com-cert.pem] - - ORDERER_GENERAL_TLS_CLIENTROOTCAS=[/etc/hyperledger/msp/orderer/cacerts/example.com-cert.pem, /etc/hyperledger/msp/peerOrg1/cacerts/org1.example.com-cert.pem, /etc/hyperledger/msp/peerOrg2/cacerts/org2.example.com-cert.pem] - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer - command: orderer - ports: - - 7050:7050 - volumes: - - ./channel:/etc/hyperledger/configtx - - ./channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/:/etc/hyperledger/msp/orderer - - ./channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peerOrg1 - - ./channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/msp/peerOrg2 - - peer0.org1.example.com: - container_name: peer0.org1.example.com - image: hyperledger/fabric-peer${DOCKER_IMG_TAG} - environment: - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_PEER_ID=peer0.org1.example.com - - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_LISTENADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 - - FABRIC_LOGGING_SPEC=debug - ## the following setting redirects chaincode container logs to the peer container logs - - CORE_VM_DOCKER_ATTACHSTDOUT=true - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/ - - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/msp/peer/tls/key.pem - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/msp/peer/tls/cert.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/msp/peer/cacerts/org1.example.com-cert.pem - - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/msp/peer/cacerts/org1.example.com-cert.pem - # # the following setting starts chaincode containers on the same - # # bridge network as the peers - # # https://docs.docker.com/compose/networking/ - - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=fixtures_default - working_dir: /opt/gopath/src/github.com/hyperledger/fabric - command: peer node start - ports: - - 7051:7051 - volumes: - - /var/run/:/host/var/run/ - - ./channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peer - depends_on: - - orderer.example.com - - peer0.org2.example.com: - container_name: peer0.org2.example.com - image: hyperledger/fabric-peer${DOCKER_IMG_TAG} - environment: - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_PEER_ID=peer0.org2.example.com - - CORE_PEER_ADDRESS=peer0.org2.example.com:8051 - - CORE_PEER_LISTENADDRESS=peer0.org2.example.com:8051 - - CORE_PEER_GOSSIP_ENDPOINT=peer0.org2.example.com:8051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:8051 - - CORE_PEER_LOCALMSPID=Org2MSP - - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/ - - FABRIC_LOGGING_SPEC=debug - - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/msp/peer/tls/key.pem - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/msp/peer/tls/cert.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/msp/peer/cacerts/org2.example.com-cert.pem - - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/msp/peer/cacerts/org2.example.com-cert.pem - # # the following setting starts chaincode containers on the same - # # bridge network as the peers - # # https://docs.docker.com/compose/networking/ - - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=fixtures_default - working_dir: /opt/gopath/src/github.com/hyperledger/fabric - command: peer node start - ports: - - 8051:8051 - volumes: - - /var/run/:/host/var/run/ - - ./channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/msp/peer - depends_on: - - orderer.example.com - - couchdb: - container_name: couchdb - image: hyperledger/fabric-couchdb${THIRDPARTY_IMG_TAG} - ports: - - 5984:5984 - environment: - DB_URL: http://localhost:5984/member_db diff --git a/test/scenario/docker-compose/docker-compose-base.yaml b/test/fixtures/docker-compose/docker-compose-base.yaml similarity index 72% rename from test/scenario/docker-compose/docker-compose-base.yaml rename to test/fixtures/docker-compose/docker-compose-base.yaml index 5f41002fb7..b90043e4e2 100644 --- a/test/scenario/docker-compose/docker-compose-base.yaml +++ b/test/fixtures/docker-compose/docker-compose-base.yaml @@ -19,13 +19,13 @@ services: environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-org1 - - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org1.example.com-cert.pem + - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/key.pem ports: - "7054:7054" - command: sh -c 'fabric-ca-server start --cfg.identities.allowremove --cfg.affiliations.allowremove -b admin:adminpw -d' + command: sh -c 'fabric-ca-server start --cfg.identities.allowremove --cfg.affiliations.allowremove -b admin:adminpw -d' volumes: - - ../config/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config container_name: ca_peerOrg1 ca1: @@ -33,13 +33,13 @@ services: environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-org2 - - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org2.example.com-cert.pem + - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/key.pem ports: - "8054:7054" command: sh -c 'fabric-ca-server start -b admin:adminpw -d' volumes: - - ../config/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config container_name: ca_peerOrg2 orderer: @@ -51,17 +51,14 @@ services: - ORDERER_GENERAL_GENESISMETHOD=file - ORDERER_GENERAL_GENESISFILE=/etc/hyperledger/configtx/twoorgs.genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - - ORDERER_GENERAL_LOCALMSPDIR=/etc/hyperledger/msp/orderer - - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=cucumber_default + - ORDERER_GENERAL_LOCALMSPDIR=/etc/hyperledger/orderer/msp + - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer command: orderer ports: - 7050:7050 volumes: - - ../config/crypto-config:/etc/hyperledger/configtx - - ../config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/:/etc/hyperledger/msp/orderer - - ../config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peerOrg1 - - ../config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/msp/peerOrg2 + - ../crypto-material/config-base:/etc/hyperledger/configtx peer: container_name: peer @@ -74,24 +71,21 @@ services: - CORE_PEER_PROFILE_ENABLED=true # LOGGING SETTINGS - - CORE_LOGGING_LEVEL=${DOCKER_DEBUG} - - CORE_CHAINCODE_LOGGING_LEVE=${DOCKER_DEBUG} + - FABRIC_LOGGING_SPEC=${DOCKER_DEBUG} + - CORE_CHAINCODE_LOGGING_LEVEL=${DOCKER_DEBUG} - CORE_LOGGING_MSP=${DOCKER_DEBUG} - CORE_LOGGING_GRPC=${DOCKER_DEBUG} - CORE_LOGGING_LEDGER=${DOCKER_DEBUG} - CORE_LOGGING_GOSSIP=${DOCKER_DEBUG} - CORE_LOGGING_PEER_GOSSIP=${DOCKER_DEBUG} - # TLS SETTINGS - - CORE_PEER_TLS_ENABLED=false - ## the following setting redirects chaincode container logs to the peer container logs - CORE_VM_DOCKER_ATTACHSTDOUT=true # # the following setting starts chaincode containers on the same # # bridge network as the peers # # https://docs.docker.com/compose/networking/ - - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=cucumber_default + - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default working_dir: /opt/gopath/src/github.com/hyperledger/fabric command: peer node start volumes: @@ -99,4 +93,4 @@ services: couchdb: container_name: couchdb - image: hyperledger/fabric-couchdb + image: hyperledger/fabric-couchdb${THIRDPARTY_IMG_TAG} diff --git a/test/fixtures/docker-compose/docker-compose-tls-level-db.yaml b/test/fixtures/docker-compose/docker-compose-tls-level-db.yaml new file mode 100644 index 0000000000..864a40123b --- /dev/null +++ b/test/fixtures/docker-compose/docker-compose-tls-level-db.yaml @@ -0,0 +1,141 @@ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +version: '2' + +services: + + ca0.example.com: + extends: + file: docker-compose-base.yaml + service: ca0 + container_name: ca0.example.com + environment: + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-tlsca/tlsca.org1.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-tlsca/key.pem + volumes: + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/:/etc/hyperledger/fabric-ca-server-tlsca + + ca1.example.com: + extends: + file: docker-compose-base.yaml + service: ca1 + container_name: ca1.example.com + environment: + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-tlsca/tlsca.org2.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-tlsca/key.pem + volumes: + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/:/etc/hyperledger/fabric-ca-server-tlsca + + orderer.example.com: + extends: + file: docker-compose-base.yaml + service: orderer + container_name: orderer.example.com + environment: + - ORDERER_GENERAL_TLS_ENABLED=true + - ORDERER_GENERAL_TLS_CLIENTAUTHREQUIRED=true + - ORDERER_GENERAL_TLS_PRIVATEKEY=/etc/hyperledger/orderer/tls/server.key + - ORDERER_GENERAL_TLS_CERTIFICATE=/etc/hyperledger/orderer/tls/server.crt + - ORDERER_GENERAL_TLS_ROOTCAS=[/etc/hyperledger/orderer/tls/ca.crt, /etc/hyperledger/peerOrg1/tls/ca.crt, /etc/hyperledger/peerOrg2/tls/ca.crt] + # ORDERER_GENERAL_TLS_CLIENTROOTCAS = [orderer_rootca + peerorg_rootca + peers_rootca] + - ORDERER_GENERAL_TLS_CLIENTROOTCAS=[/etc/hyperledger/orderer/tls/ca.crt, /etc/hyperledger/peerOrg1/msp/cacerts/ca.org1.example.com-cert.pem, /etc/hyperledger/peerOrg2/msp/cacerts/ca.org2.example.com-cert.pem, /etc/hyperledger/peerOrg1/tls/ca.crt, /etc/hyperledger/peerOrg2/tls/ca.crt] + volumes: + - ../crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/:/etc/hyperledger/orderer + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/peerOrg1 + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/peerOrg2 + + peer0.org1.example.com: + extends: + file: docker-compose-base.yaml + service: peer + container_name: peer0.org1.example.com + environment: + - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock + - CORE_PEER_ID=peer0.org1.example.com + - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 + - CORE_PEER_LISTENADDRESS=peer0.org1.example.com:7051 + - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 + - CORE_PEER_LOCALMSPID=Org1MSP + - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/peerOrg1/msp + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051 + + + ## Enable TLS + - CORE_PEER_TLS_ENABLED=true + - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/peerOrg1/tls/server.key + - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/peerOrg1/tls/server.crt + - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/peerOrg1/tls/ca.crt + - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true + - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/peerOrg1/tls/ca.crt /etc/hyperledger/peerOrg1/msp/cacerts/ca.org1.example.com-cert.pem /etc/hyperledger/peerOrg1/msp/tlscacerts/tlsca.org1.example.com-cert.pem /etc/hyperledger/peerOrg2/msp/cacerts/ca.org2.example.com-cert.pem /etc/hyperledger/peerOrg2/msp/tlscacerts/tlsca.org2.example.com-cert.pem + - CORE_PEER_TLS_CLIENTKEY_FILE=/etc/hyperledger/users/Admin@org1.example.com/tls/client.key + - CORE_PEER_TLS_CLIENTCERT_FILE=/etc/hyperledger/users/Admin@org1.example.com/tls/client.crt + ports: + - 7051:7051 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/peerOrg1 + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/peerOrg2 + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/users/:/etc/hyperledger/users + depends_on: + - orderer.example.com + + peer0.org2.example.com: + extends: + file: docker-compose-base.yaml + service: peer + container_name: peer0.org2.example.com + + environment: + - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock + - CORE_PEER_ID=peer0.org2.example.com + - CORE_PEER_ADDRESS=peer0.org2.example.com:8051 + - CORE_PEER_LISTENADDRESS=peer0.org2.example.com:8051 + - CORE_PEER_GOSSIP_ENDPOINT=peer0.org2.example.com:8051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:8051 + - CORE_PEER_LOCALMSPID=Org2MSP + - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/peerOrg2/msp + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:8051 + + ## Enable TLS + - CORE_PEER_TLS_ENABLED=true + - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/peerOrg2/tls/server.key + - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/peerOrg2/tls/server.crt + - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/peerOrg2/tls/ca.crt + - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true + - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/peerOrg2/tls/ca.crt /etc/hyperledger/peerOrg2/msp/cacerts/ca.org2.example.com-cert.pem /etc/hyperledger/peerOrg2/msp/tlscacerts/tlsca.org2.example.com-cert.pem /etc/hyperledger/peerOrg1/msp/cacerts/ca.org1.example.com-cert.pem /etc/hyperledger/peerOrg1/msp/tlscacerts/tlsca.org1.example.com-cert.pem + - CORE_PEER_TLS_CLIENTKEY_FILE=/etc/hyperledger/users/Admin@org2.example.com/tls/client.key + - CORE_PEER_TLS_CLIENTCERT_FILE=/etc/hyperledger/users/Admin@org2.example.com/tls/client.crt + + ports: + - 8051:8051 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/peerOrg2 + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/peerOrg1 + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/users/:/etc/hyperledger/users + depends_on: + - orderer.example.com + + couchdb: + extends: + file: docker-compose-base.yaml + service: couchdb + container_name: couchdb + ports: + - 5984:5984 + environment: + DB_URL: http://localhost:5984/member_db diff --git a/test/fixtures/docker-compose/docker-compose-tls.yaml b/test/fixtures/docker-compose/docker-compose-tls.yaml new file mode 100644 index 0000000000..ed17520285 --- /dev/null +++ b/test/fixtures/docker-compose/docker-compose-tls.yaml @@ -0,0 +1,161 @@ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +version: '2' + +services: + + ca0.example.com: + extends: + file: docker-compose-base.yaml + service: ca0 + container_name: ca0.example.com + environment: + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-tlsca/tlsca.org1.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-tlsca/key.pem + volumes: + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/tlsca/:/etc/hyperledger/fabric-ca-server-tlsca + + ca1.example.com: + extends: + file: docker-compose-base.yaml + service: ca1 + container_name: ca1.example.com + environment: + - FABRIC_CA_SERVER_TLS_ENABLED=true + - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-tlsca/tlsca.org2.example.com-cert.pem + - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-tlsca/key.pem + volumes: + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/tlsca/:/etc/hyperledger/fabric-ca-server-tlsca + + orderer.example.com: + extends: + file: docker-compose-base.yaml + service: orderer + container_name: orderer.example.com + environment: + - ORDERER_GENERAL_TLS_ENABLED=true + - ORDERER_GENERAL_TLS_CLIENTAUTHREQUIRED=true + - ORDERER_GENERAL_TLS_PRIVATEKEY=/etc/hyperledger/orderer/tls/server.key + - ORDERER_GENERAL_TLS_CERTIFICATE=/etc/hyperledger/orderer/tls/server.crt + - ORDERER_GENERAL_TLS_ROOTCAS=[/etc/hyperledger/orderer/tls/ca.crt, /etc/hyperledger/peerOrg1/tls/ca.crt, /etc/hyperledger/peerOrg2/tls/ca.crt] + # ORDERER_GENERAL_TLS_CLIENTROOTCAS = [orderer_rootca + peerorg_rootca + peers_rootca] + - ORDERER_GENERAL_TLS_CLIENTROOTCAS=[/etc/hyperledger/orderer/tls/ca.crt, /etc/hyperledger/peerOrg1/msp/cacerts/ca.org1.example.com-cert.pem, /etc/hyperledger/peerOrg2/msp/cacerts/ca.org2.example.com-cert.pem, /etc/hyperledger/peerOrg1/tls/ca.crt, /etc/hyperledger/peerOrg2/tls/ca.crt] + volumes: + - ../crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/:/etc/hyperledger/orderer + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/peerOrg1 + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/peerOrg2 + + peer0.org1.example.com: + extends: + file: docker-compose-base.yaml + service: peer + container_name: peer0.org1.example.com + environment: + - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock + - CORE_PEER_ID=peer0.org1.example.com + - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 + - CORE_PEER_LISTENADDRESS=peer0.org1.example.com:7051 + - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 + - CORE_PEER_LOCALMSPID=Org1MSP + - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/peerOrg1/msp + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051 + + + # Enable TLS + - CORE_PEER_TLS_ENABLED=true + - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/peerOrg1/tls/server.key + - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/peerOrg1/tls/server.crt + - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/peerOrg1/tls/ca.crt + - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true + - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/peerOrg1/tls/ca.crt /etc/hyperledger/peerOrg1/msp/cacerts/ca.org1.example.com-cert.pem /etc/hyperledger/peerOrg1/msp/tlscacerts/tlsca.org1.example.com-cert.pem /etc/hyperledger/peerOrg2/msp/cacerts/ca.org2.example.com-cert.pem /etc/hyperledger/peerOrg2/msp/tlscacerts/tlsca.org2.example.com-cert.pem + - CORE_PEER_TLS_CLIENTKEY_FILE=/etc/hyperledger/users/Admin@org1.example.com/tls/client.key + - CORE_PEER_TLS_CLIENTCERT_FILE=/etc/hyperledger/users/Admin@org1.example.com/tls/client.crt + + # Use CouchDB + - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb.org1.example.com:5984 + ports: + - 7051:7051 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/peerOrg1 + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/peerOrg2 + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/users/:/etc/hyperledger/users + depends_on: + - orderer.example.com + - couchdb.org1.example.com + + couchdb.org1.example.com: + extends: + file: docker-compose-base.yaml + service: couchdb + container_name: couchdb.org1.example.com + ports: + - 5984:5984 + environment: + DB_URL: http://localhost:5984/member_db + + peer0.org2.example.com: + extends: + file: docker-compose-base.yaml + service: peer + container_name: peer0.org2.example.com + + environment: + - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock + - CORE_PEER_ID=peer0.org2.example.com + - CORE_PEER_ADDRESS=peer0.org2.example.com:8051 + - CORE_PEER_LISTENADDRESS=peer0.org2.example.com:8051 + - CORE_PEER_GOSSIP_ENDPOINT=peer0.org2.example.com:8051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:8051 + - CORE_PEER_LOCALMSPID=Org2MSP + - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/peerOrg2/msp + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:8051 + + # Enable TLS + - CORE_PEER_TLS_ENABLED=true + - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/peerOrg2/tls/server.key + - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/peerOrg2/tls/server.crt + - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/peerOrg2/tls/ca.crt + - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true + - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/peerOrg2/tls/ca.crt /etc/hyperledger/peerOrg2/msp/cacerts/ca.org2.example.com-cert.pem /etc/hyperledger/peerOrg2/msp/tlscacerts/tlsca.org2.example.com-cert.pem /etc/hyperledger/peerOrg1/msp/cacerts/ca.org1.example.com-cert.pem /etc/hyperledger/peerOrg1/msp/tlscacerts/tlsca.org1.example.com-cert.pem + - CORE_PEER_TLS_CLIENTKEY_FILE=/etc/hyperledger/users/Admin@org2.example.com/tls/client.key + - CORE_PEER_TLS_CLIENTCERT_FILE=/etc/hyperledger/users/Admin@org2.example.com/tls/client.crt + + # Use CouchDB + - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb.org2.example.com:5984 + + ports: + - 8051:8051 + volumes: + - /var/run/:/host/var/run/ + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/peerOrg2 + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/peerOrg1 + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/users/:/etc/hyperledger/users + depends_on: + - orderer.example.com + - couchdb.org2.example.com + + couchdb.org2.example.com: + extends: + file: docker-compose-base.yaml + service: couchdb + container_name: couchdb.org2.example.com + ports: + - 6984:5984 + environment: + DB_URL: http://localhost:5984/member_db diff --git a/test/scenario/docker-compose/docker-compose.yaml b/test/fixtures/docker-compose/docker-compose.yaml similarity index 87% rename from test/scenario/docker-compose/docker-compose.yaml rename to test/fixtures/docker-compose/docker-compose.yaml index 91e49039c4..a2b75b90d7 100644 --- a/test/scenario/docker-compose/docker-compose.yaml +++ b/test/fixtures/docker-compose/docker-compose.yaml @@ -47,7 +47,9 @@ services: - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:7051 - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/ + - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/peer/msp + + - CORE_PEER_TLS_ENABLED=false - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb.org1.example.com:5984 @@ -56,7 +58,7 @@ services: - 7051:7051 volumes: - /var/run/:/host/var/run/ - - ../config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peer + - ../crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/peer depends_on: - orderer.example.com - couchdb.org1.example.com @@ -85,7 +87,9 @@ services: - CORE_PEER_GOSSIP_ENDPOINT=peer0.org2.example.com:8051 - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:8051 - CORE_PEER_LOCALMSPID=Org2MSP - - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/ + - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/peer/msp + + - CORE_PEER_TLS_ENABLED=false - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb.org2.example.com:5984 @@ -93,7 +97,7 @@ services: - 8051:8051 volumes: - /var/run/:/host/var/run/ - - ../config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/msp/peer + - ../crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com:/etc/hyperledger/peer depends_on: - orderer.example.com - couchdb.org2.example.com diff --git a/test/fixtures/msp/local/keystore/admin.pem b/test/fixtures/msp/local/keystore/admin.pem deleted file mode 100644 index 8edafa5e5c..0000000000 --- a/test/fixtures/msp/local/keystore/admin.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2HxfPVxvwHYM5X8o -/tEoDZ54Rl9uW13U6RElpnFOCruhRANCAATx8pv9DCChfwHoa7IRUf2z7GTmC3k2 -Tl8e7DWA9fZ4cpL9vdk0ZMgQZKo8Gm61NSTuHMZ8zp3uZn7QOcCmwuDg ------END PRIVATE KEY----- diff --git a/test/fixtures/msp/local/signcerts/admin.pem b/test/fixtures/msp/local/signcerts/admin.pem deleted file mode 100644 index 50900d19ec..0000000000 --- a/test/fixtures/msp/local/signcerts/admin.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIB8TCCAZegAwIBAgIUasxwoRvBrGrdyg9+HtdJ3brpcuMwCgYIKoZIzj0EAwIw -fzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh -biBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdldHMsIEluYy4xDDAK -BgNVBAsTA1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTcwMTE5MTk1NjAw -WhcNMTcxMjE5MDM1NjAwWjAQMQ4wDAYDVQQDEwVhZG1pbjBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABPHym/0MIKF/AehrshFR/bPsZOYLeTZOXx7sNYD19nhykv29 -2TRkyBBkqjwabrU1JO4cxnzOne5mftA5wKbC4OCjYDBeMA4GA1UdDwEB/wQEAwIC -BDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQtEfVCvKOzNSiTgpaWzaYVm6eaBzAf -BgNVHSMEGDAWgBQXZ0I9qp6CP8TFHZ9bw5nRtZxIEDAKBggqhkjOPQQDAgNIADBF -AiEAvGd5YDIBeQZWpP9wEHFmezvSCjrzy8VcvH/7Yuv3vcoCICy5ssNrEHEyWXqB -qeKfU/zrPhHsWJFIaJEDQLRQE05l ------END CERTIFICATE----- \ No newline at end of file diff --git a/test/fixtures/msp/org0/admincerts/admin.pem b/test/fixtures/msp/org0/admincerts/admin.pem deleted file mode 100644 index 3922b95e46..0000000000 --- a/test/fixtures/msp/org0/admincerts/admin.pem +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBwTCCAWegAwIBAgIUS34H+bjGij1WZvTbc63YLlPEMCUwCgYIKoZIzj0EAwIw -TzELMAkGA1UEBhMCVVMxFDASBgNVBAoTC0h5cGVybGVkZ2VyMSowKAYDVQQDEyFU -cmFuc2FjdGlvbiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTcwMjEwMTgyNzAw -WhcNMTgwMTEwMDIyNzAwWjAQMQ4wDAYDVQQDEwVhZG1pbjBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABGtQi+dqAwv4pReiz/4XR2Zi8VjyjsRqKvHNufWwQYQ9cQ/L -r9LBorlbRfcv00JsFRJb3DU8edNSCXGgFMnPMmujYDBeMA4GA1UdDwEB/wQEAwIC -BDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQVz3t/i3/zn1XifsVTynRM7BVnoDAf -BgNVHSMEGDAWgBSRULWdqUi+VpEMgeU8F/q9FGCZjzAKBggqhkjOPQQDAgNIADBF -AiEAjb/mObUaf04qgyQHMsawn6ddPBeBqT3HM1XsuEsviSwCICz6kxz4tzZLxQPk -risyGwYi7oazS3o8IEvIAAQH6m2B ------END CERTIFICATE----- \ No newline at end of file diff --git a/test/fixtures/msp/org0/cacerts/org_ca.pem b/test/fixtures/msp/org0/cacerts/org_ca.pem deleted file mode 100755 index 74eceb69e0..0000000000 --- a/test/fixtures/msp/org0/cacerts/org_ca.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQTCCAcagAwIBAgIUQel8iXQdKaVJJABbwbekcZj37PQwCgYIKoZIzj0EAwMw -TzELMAkGA1UEBhMCVVMxFDASBgNVBAoTC0h5cGVybGVkZ2VyMSowKAYDVQQDEyFU -cmFuc2FjdGlvbiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTcwMjEwMTgyMDAw -WhcNMjIwMjA5MTgyMDAwWjBPMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLSHlwZXJs -ZWRnZXIxKjAoBgNVBAMTIVRyYW5zYWN0aW9uIENlcnRpZmljYXRlIEF1dGhvcml0 -eTB2MBAGByqGSM49AgEGBSuBBAAiA2IABD5gsruQ5klLZVECSW1y4e1VdgrpFNEa -yWCgA6d9uvx96/C6fD4cXgvlM4V9BXkbeHTsQjtO0vd6Aimi0vhdOu2tzKVAwSEq -+YDpaVOuZMYlAuaLdpU9lee9gjbFGyXQOqNjMGEwDgYDVR0PAQH/BAQDAgEGMA8G -A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJFQtZ2pSL5WkQyB5TwX+r0UYJmPMB8G -A1UdIwQYMBaAFJFQtZ2pSL5WkQyB5TwX+r0UYJmPMAoGCCqGSM49BAMDA2kAMGYC -MQDxtLRjPNMF7xPMC/tNzr2hdmGhREw6xw0fU54IudNE8wn+qYbH2bMezdZz1vSd -/kYCMQDuG6NCaBXYzltRh5mslAyanYw/xKvT8S3SNNB1av8kGB2HO7TKleqm6OC9 -9lgKK4w= ------END CERTIFICATE----- diff --git a/test/fixtures/msp/org1/admincerts/admin.pem b/test/fixtures/msp/org1/admincerts/admin.pem deleted file mode 100644 index 77bf7662f2..0000000000 --- a/test/fixtures/msp/org1/admincerts/admin.pem +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBwTCCAWegAwIBAgIUJfcDpoSSnoUrWjqHunlel/F7It8wCgYIKoZIzj0EAwIw -TzELMAkGA1UEBhMCVUsxFDASBgNVBAoTC0h5cGVybGVkZ2VyMSowKAYDVQQDEyFU -cmFuc2FjdGlvbiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTcwMjEwMTgzNTAw -WhcNMTgwMTEwMDIzNTAwWjAQMQ4wDAYDVQQDEwVhZG1pbjBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABE8V7+p+gdNZtiGPZnJ0DNCLsXOEiMa1xj2eGo8geyVjXt3T -Qjl5nCXyu4Hp6luchZnynEKH9BskVWf9bCAD5qijYDBeMA4GA1UdDwEB/wQEAwIC -BDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRHwo2hSZl2ZsXfihAsK+yehg5jTDAf -BgNVHSMEGDAWgBTVtYvw7nizPfbI47cMyKy87ib4XTAKBggqhkjOPQQDAgNIADBF -AiEA7WxrA2jFX0zfrobmSlC2sbLpicNxn1UrNS/cXVNXM/sCIGmZCysSDQ0tdKqY -M2ECTOmfRcE1kEgNX2JbajR5F/12 ------END CERTIFICATE----- \ No newline at end of file diff --git a/test/fixtures/msp/org1/cacerts/org_ca.pem b/test/fixtures/msp/org1/cacerts/org_ca.pem deleted file mode 100755 index ad81eec1d9..0000000000 --- a/test/fixtures/msp/org1/cacerts/org_ca.pem +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBDjCBtQICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9yZzEwHhcN -MTcwMTI0MTk1NTQ1WhcNMTgwMTI0MTk1NTQ1WjATMREwDwYDVQQDDAhwZWVyT3Jn -MTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPi8WnwoK2C3n+vDktN1jPan9Ac8 -TeL9qQynMFZ15fdD8eOlhi2pk1koX8dfWfJuG3FU1cCvBM8YCNbqaNFYU2YwCgYI -KoZIzj0EAwIDSAAwRQIgaSOImd20mKZeddceGMrgtBU12mE1oQl3zt6xyJcV5PQC -IQCXmOyvtyRqiVop3BOVXAbnFvWTHjNs9UFRk7Hpc2vWAA== ------END CERTIFICATE----- diff --git a/test/fixtures/network-ad.yaml b/test/fixtures/network-ad.yaml index c1e7289483..685bcca7bd 100644 --- a/test/fixtures/network-ad.yaml +++ b/test/fixtures/network-ad.yaml @@ -27,9 +27,9 @@ organizations: certificateAuthorities: - ca-org1 adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem Org2: mspid: Org2MSP peers: @@ -37,9 +37,9 @@ organizations: certificateAuthorities: - ca-org2 adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/5a983ddcbefe52a7f9b8ee5b85a590c3e3a43c4ccd70c7795bec504e7f74848d_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem orderers: orderer.example.com: @@ -47,7 +47,7 @@ orderers: grpcOptions: ssl-target-name-override: orderer.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem peers: peer0.org1.example.com: @@ -55,14 +55,14 @@ peers: grpcOptions: ssl-target-name-override: peer0.org1.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem peer0.org2.example.com: url: grpcs://localhost:8051 grpcOptions: ssl-target-name-override: peer0.org2.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem certificateAuthorities: ca-org1: @@ -70,7 +70,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem registrar: - enrollId: admin enrollSecret: adminpw @@ -81,7 +81,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem registrar: - enrollId: admin enrollSecret: adminpw diff --git a/test/fixtures/network-discovery.json b/test/fixtures/network-discovery.json index eabef5a2be..b470359756 100644 --- a/test/fixtures/network-discovery.json +++ b/test/fixtures/network-discovery.json @@ -1,24 +1,24 @@ { - "name":"global-trade-network", - "description":"The network to be in if you want to stay in the global trade business", - "version":"1.0", - "organizations":{ - "Org1":{ - "mspid":"Org1MSP", - "peers":[ - "peer0.org1.example.com" - ] - } - }, - "peers":{ - "peer0.org1.example.com":{ - "url":"grpcs://localhost:7051", - "grpcOptions":{ - "ssl-target-name-override":"peer0.org1.example.com" - }, - "tlsCACerts":{ - "path":"test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem" - } - } + "name":"global-trade-network", + "description":"The network to be in if you want to stay in the global trade business", + "version":"1.0", + "organizations":{ + "Org1":{ + "mspid":"Org1MSP", + "peers":[ + "peer0.org1.example.com" + ] + } + }, + "peers":{ + "peer0.org1.example.com":{ + "url":"grpcs://localhost:7051", + "grpcOptions":{ + "ssl-target-name-override":"peer0.org1.example.com" + }, + "tlsCACerts":{ + "path":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem" + } + } + } } -} diff --git a/test/fixtures/network-ts.yaml b/test/fixtures/network-ts.yaml index b9807d1cc9..98cd075f49 100644 --- a/test/fixtures/network-ts.yaml +++ b/test/fixtures/network-ts.yaml @@ -129,9 +129,9 @@ organizations: # this way. The SDK should allow applications to set the org admin identity via APIs, and only use # this route as an alternative when it exists. adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and @@ -145,9 +145,9 @@ organizations: certificateAuthorities: - ca-org2 adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/5a983ddcbefe52a7f9b8ee5b85a590c3e3a43c4ccd70c7795bec504e7f74848d_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem # # List of orderers to send transaction and channel create/update requests to. For the time @@ -164,7 +164,7 @@ orderers: ssl-target-name-override: orderer.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem # # List of peers to send various requests to, including endorsement, query @@ -179,14 +179,14 @@ peers: ssl-target-name-override: peer0.org1.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem peer0.org2.example.com: url: grpcs://localhost:8051 grpcOptions: ssl-target-name-override: peer0.org2.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem # # Fabric-CA is a special kind of Certificate Authority provided by Hyperledger Fabric which allows @@ -201,7 +201,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem # Fabric-CA supports dynamic user enrollment via REST APIs. A "root" user, a.k.a registrar, is # needed to enroll and invoke new users. @@ -216,7 +216,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem registrar: - enrollId: admin enrollSecret: adminpw diff --git a/test/fixtures/network.json b/test/fixtures/network.json index c7973091c8..f7f596dd69 100644 --- a/test/fixtures/network.json +++ b/test/fixtures/network.json @@ -1,108 +1,127 @@ { - "name":"global-trade-network", - "description":"The network to be in if you want to stay in the global trade business", - "version":"1.0", - "client":{ - "organization":"Org1", - "credentialStore":{ - "path":"/tmp/hfc-kvs", - "cryptoStore":{ - "path":"/tmp/hfc-cvs" - }, - "wallet":"wallet-name" - } - }, - "channels":{ - "mychannel":{ - "orderers":[ - "orderer.example.com" - ], - "peers":{ - "peer0.org1.example.com":{ - "endorsingPeer":true, - "chaincodeQuery":true, - "ledgerQuery":true, - "eventSource":true - }, - "peer0.org2.example.com":{ - "endorsingPeer":true, - "chaincodeQuery":false, - "ledgerQuery":true, - "eventSource":false - } - }, - "chaincodes":[ - "example02:v1", - "marbles:1.0" - ] - } - }, - "organizations":{ - "Org1":{ - "mspid":"Org1MSP", - "peers":[ - "peer0.org1.example.com", - "peer1.org1.example.com" - ], - "certificateAuthorities":[ - "ca-org1" - ], - "adminPrivateKeyPEM":"-----BEGIN PRIVATE KEY----- ", - "signedCertPEM":"-----BEGIN CERTIFICATE----- " - }, - "Org2":{ - "mspid":"Org2MSP", - "peers":[ - "peer0.org2.example.com" - ] - } - }, - "orderers":{ - "orderer.example.com":{ - "url":"grpcs://localhost:7050", - "grpcOptions":{ - "ssl-target-name-override":"orderer.example.com" - }, - "tlsCACerts":{ - "path":"test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem" - } - } - }, - "peers":{ - "peer0.org1.example.com":{ - "url":"grpcs://localhost:7051", - "grpcOptions":{ - "ssl-target-name-override":"peer0.org1.example.com" - }, - "tlsCACerts":{ - "path":"test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem" - } - }, - "peer0.org2.example.com":{ - "url":"grpcs://localhost:8051", - "grpcOptions":{ - "ssl-target-name-override":"peer0.org2.example.com" - }, - "tlsCACerts":{ - "path":"test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem" - } - } - }, - "certificateAuthorities":{ - "ca-org1":{ - "url":"https://localhost:7054", - "httpOptions":{ - "verify": false - }, - "tlsCACerts":{ - "path":"test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem" - }, - "registrar":[ - { - "enrollId":"admin", - "enrollSecret":"adminpw" - } - ] - } + "name":"test-network", + "description":"Basic test network", + "version":"1.0", + "client":{ + "organization":"Org1", + "credentialStore":{ + "path":"/tmp/hfc-kvs", + "cryptoStore":{ + "path":"/tmp/hfc-cvs" + }, + "wallet":"wallet-name" + } + }, + "channels":{ + "mychannel":{ + "orderers":[ + "orderer.example.com" + ], + "peers":{ + "peer0.org1.example.com":{ + "endorsingPeer":true, + "chaincodeQuery":true, + "ledgerQuery":true, + "eventSource":true + }, + "peer0.org2.example.com":{ + "endorsingPeer":true, + "chaincodeQuery":false, + "ledgerQuery":true, + "eventSource":false + } + }, + "chaincodes":[ + "example02:v1", + "marbles:1.0" + ] + } + }, + "organizations":{ + "Org1":{ + "mspid":"Org1MSP", + "peers":[ + "peer0.org1.example.com" + ], + "certificateAuthorities":[ + "ca-org1" + ], + "adminPrivateKeyPEM":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem", + "signedCertPEM":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem" + }, + "Org2":{ + "mspid":"Org2MSP", + "peers":[ + "peer0.org2.example.com" + ], + "certificateAuthorities":[ + "ca-org2" + ], + "adminPrivateKeyPEM":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem", + "signedCertPEM":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem" + } + }, + "orderers":{ + "orderer.example.com":{ + "url":"grpcs://localhost:7050", + "grpcOptions":{ + "ssl-target-name-override":"orderer.example.com" + }, + "tlsCACerts":{ + "path":"test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem" + } + } + }, + "peers":{ + "peer0.org1.example.com":{ + "url":"grpcs://localhost:7051", + "grpcOptions":{ + "ssl-target-name-override":"peer0.org1.example.com" + }, + "tlsCACerts":{ + "path":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem" + } + }, + "peer0.org2.example.com":{ + "url":"grpcs://localhost:8051", + "grpcOptions":{ + "ssl-target-name-override":"peer0.org2.example.com" + }, + "tlsCACerts":{ + "path":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem" + } + } + }, + "certificateAuthorities":{ + "ca-org1":{ + "url":"https://localhost:7054", + "httpOptions":{ + "verify": false + }, + "tlsCACerts":{ + "path":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem" + }, + "registrar":[ + { + "enrollId":"admin", + "enrollSecret":"adminpw" + } + ] + }, + "ca-org2":{ + "url":"https://localhost:8054", + "httpOptions":{ + "verify": false + }, + "tlsCACerts":{ + "path":"test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem" + }, + "registrar":[ + { + "enrollId":"admin", + "enrollSecret":"adminpw" + } + ] + } + } } -} diff --git a/test/fixtures/network.yaml b/test/fixtures/network.yaml index 51cb08aab8..592cd51081 100644 --- a/test/fixtures/network.yaml +++ b/test/fixtures/network.yaml @@ -130,9 +130,9 @@ organizations: # this way. The SDK should allow applications to set the org admin identity via APIs, and only use # this route as an alternative when it exists. adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and @@ -146,9 +146,9 @@ organizations: certificateAuthorities: - ca-org2 adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/5a983ddcbefe52a7f9b8ee5b85a590c3e3a43c4ccd70c7795bec504e7f74848d_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem # # List of orderers to send transaction and channel create/update requests to. For the time @@ -165,7 +165,7 @@ orderers: ssl-target-name-override: orderer.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem # # List of peers to send various requests to, including endorsement, query @@ -181,14 +181,14 @@ peers: request-timeout: 120001 tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem peer0.org2.example.com: url: grpcs://localhost:8051 grpcOptions: ssl-target-name-override: peer0.org2.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem # # Fabric-CA is a special kind of Certificate Authority provided by Hyperledger Fabric which allows @@ -203,7 +203,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem # Fabric-CA supports dynamic user enrollment via REST APIs. A "root" user, a.k.a registrar, is # needed to enroll and invoke new users. @@ -218,7 +218,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem registrar: - enrollId: admin enrollSecret: adminpw diff --git a/test/fixtures/network2.yaml b/test/fixtures/network2.yaml index 9ff4937d16..7aa71ddc76 100644 --- a/test/fixtures/network2.yaml +++ b/test/fixtures/network2.yaml @@ -62,9 +62,9 @@ organizations: - ca-org1 adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem Org2: mspid: Org2MSP @@ -73,9 +73,9 @@ organizations: certificateAuthorities: - ca-org2 adminPrivateKey: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/5a983ddcbefe52a7f9b8ee5b85a590c3e3a43c4ccd70c7795bec504e7f74848d_sk + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem signedCert: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem orderers: orderer.example.com: @@ -87,7 +87,7 @@ orderers: ssl-target-name-override: orderer.example.com tlsCACerts: - path: test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem peers: peer0.org1.example.com: @@ -113,7 +113,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem # Fabric-CA supports dynamic user enrollment via REST APIs. A "root" user, a.k.a registrar, is # needed to enroll and invoke new users. @@ -128,7 +128,7 @@ certificateAuthorities: httpOptions: verify: false tlsCACerts: - path: test/fixtures/channel/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem + path: test/fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem registrar: - enrollId: admin enrollSecret: adminpw diff --git a/test/integration/channel-event-hub.js b/test/integration/channel-event-hub.js index 4da59c3777..b9b955a434 100644 --- a/test/integration/channel-event-hub.js +++ b/test/integration/channel-event-hub.js @@ -65,13 +65,13 @@ test('***** Test channel events', async (t) => { // get the peer org's admin user identity await testUtil.getSubmitter(client, t, true /* get peer org admin */, 'org1'); - let data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem')); + let data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem')); const orderer = client.newOrderer('grpcs://localhost:7050', { 'pem': Buffer.from(data).toString(), 'ssl-target-name-override': 'orderer.example.com'}); channel.addOrderer(orderer); - data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem')); + data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem')); const peer = client.newPeer('grpcs://localhost:7051', { pem: Buffer.from(data).toString(), 'ssl-target-name-override': 'peer0.org1.example.com' @@ -79,7 +79,7 @@ test('***** Test channel events', async (t) => { channel.addPeer(peer); targets.push(peer); - data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem')); + data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem')); const peer_org2 = client.newPeer('grpcs://localhost:8051', { pem: Buffer.from(data).toString(), 'ssl-target-name-override': 'peer0.org2.example.com' diff --git a/test/integration/client.js b/test/integration/client.js index 23553cd291..3c397c1664 100644 --- a/test/integration/client.js +++ b/test/integration/client.js @@ -210,10 +210,14 @@ test('\n\n ** createUser happy path - Cloudant - PEM Strings **\n\n', (t) => { client.setStateStore(store); return true; }).then(() => { + const cryptoContent = { + privateKeyPEM: fs.readFileSync(path.join(__dirname, caImport.orgs[userOrg].cryptoContent.privateKeyPEM)).toString(), + signedCertPEM: fs.readFileSync(path.join(__dirname, caImport.orgs[userOrg].cryptoContent.signedCertPEM)).toString() + }; return client.createUser( {username: caImport.orgs[userOrg].username, mspid: caImport.orgs[userOrg].mspid, - cryptoContent: caImport.orgs[userOrg].cryptoContent + cryptoContent: cryptoContent }); }, (err) => { logger.error(err.stack ? err.stack : err); diff --git a/test/integration/configtxlator.js b/test/integration/configtxlator.js index e9c4b2ee44..b8609c744a 100644 --- a/test/integration/configtxlator.js +++ b/test/integration/configtxlator.js @@ -90,7 +90,7 @@ test('\n\n***** configtxlator flow for create and then update *****\n\n', async await testUtil.getSubmitter(client, t, true /* get the org admin*/, 'org1'); t.pass('Successfully enrolled user \'admin\' for org1'); - const config_json = fs.readFileSync(path.join(__dirname, '../fixtures/channel/' + channel_name + '.json')); + const config_json = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/channel-config', channel_name + '.json')); const orderer = client.newOrderer( ORGS.orderer.url, diff --git a/test/integration/create-configtx-channel.js b/test/integration/create-configtx-channel.js index c963143537..1ab2460e13 100644 --- a/test/integration/create-configtx-channel.js +++ b/test/integration/create-configtx-channel.js @@ -75,7 +75,7 @@ test('\n\n***** Configtx Built config create flow *****\n\n', (t) => { logger.info('\n\n***** Get the configtx config update configuration *****\n\n'); // use the config update created by the configtx tool - const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/channel/' + channel_name + '.tx')); + const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/channel-config', channel_name + '.tx')); config = client.extractChannelConfig(envelope_bytes); t.pass('Successfull extracted the config update from the configtx envelope'); diff --git a/test/integration/discovery.js b/test/integration/discovery.js index 13e07338bc..2518deb909 100644 --- a/test/integration/discovery.js +++ b/test/integration/discovery.js @@ -28,8 +28,8 @@ test('\n\n***** D I S C O V E R Y *****\n\n', async (t) => { client_org1.setConfigSetting('initialize-with-discovery', true); const channel_name = 'discovery'; - const channel_path = path.join(__dirname, '../fixtures/channel/discovery.tx'); - const anchor_path = path.join(__dirname, '../fixtures/channel/discovery_anchor.tx'); + const channel_path = path.join(__dirname, '../fixtures/crypto-material/channel-config/discovery.tx'); + const anchor_path = path.join(__dirname, '../fixtures/crypto-material/channel-config/discovery_anchor.tx'); try { await createUpdateChannel(t, true, channel_path, channel_name, client_org1, client_org2); // create the channel @@ -39,16 +39,16 @@ test('\n\n***** D I S C O V E R Y *****\n\n', async (t) => { t.fail('Failed to create and update the channel'); } - let data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem')); + let data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem')); let pem = Buffer.from(data).toString(); const peer_org1 = client_org1.newPeer('grpcs://localhost:7051', {pem: pem, 'ssl-target-name-override': 'peer0.org1.example.com', name: 'peer0.org1.example.com'}); const peer_bad = client_org1.newPeer('grpcs://localhost:9999', {pem: pem, 'ssl-target-name-override': 'peer9.org1.example.com', name: 'peer9.org1.example.com'}); - data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem')); + data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem')); pem = Buffer.from(data).toString(); const peer_org2 = client_org2.newPeer('grpcs://localhost:8051', {pem: pem, 'ssl-target-name-override': 'peer0.org2.example.com', name: 'peer0.org2.example.com'}); - data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem')); + data = fs.readFileSync(path.join(__dirname, 'e2e', '../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem')); pem = Buffer.from(data).toString(); const orderer_org1 = client_org1.newOrderer('grpcs://localhost:7050', {pem: pem, 'ssl-target-name-override': 'orderer.example.com', name: 'orderer.example.com'}); const orderer_org2 = client_org2.newOrderer('grpcs://localhost:7050', {pem: pem, 'ssl-target-name-override': 'orderer.example.com', name: 'orderer.example.com'}); diff --git a/test/integration/e2e/config.json b/test/integration/e2e/config.json index c6e18c80fa..620f31888b 100644 --- a/test/integration/e2e/config.json +++ b/test/integration/e2e/config.json @@ -2,12 +2,15 @@ "test-network": { "orderer": { "url": "grpcs://localhost:7050", + "mspid": "OrdererMSP", + "msp": "../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/msp/", "server-hostname": "orderer.example.com", - "tls_cacerts": "../../fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem" + "tls_cacerts": "../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt" }, "org1": { "name": "peerOrg1", "mspid": "Org1MSP", + "msp": "../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/", "ca": { "url": "https://localhost:7054", "name": "ca-org1" @@ -15,12 +18,13 @@ "peer1": { "requests": "grpcs://localhost:7051", "server-hostname": "peer0.org1.example.com", - "tls_cacerts": "../../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem" + "tls_cacerts": "../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt" } }, "org2": { "name": "peerOrg2", "mspid": "Org2MSP", + "msp": "../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/msp/", "ca": { "url": "https://localhost:8054", "name": "ca-org2" @@ -28,7 +32,7 @@ "peer1": { "requests": "grpcs://localhost:8051", "server-hostname": "peer0.org2.example.com", - "tls_cacerts": "../../fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem" + "tls_cacerts": "../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt" } } } diff --git a/test/integration/e2e/create-channel.js b/test/integration/e2e/create-channel.js index 91d3dd789d..a86e1638b5 100644 --- a/test/integration/e2e/create-channel.js +++ b/test/integration/e2e/create-channel.js @@ -55,8 +55,8 @@ test('\n\n***** SDK Built config update create flow *****\n\n', async (t) => { client.setCryptoSuite(cryptoSuite); // use the config update created by the configtx tool - const envelope_bytes = fs.readFileSync(path.join(__dirname, '../../fixtures/channel/mychannel.tx')); - const config = client.extractChannelConfig(envelope_bytes); + const channeltx_basename = process.env.channeltx_subdir ? path.join(process.env.channeltx_subdir, channel_name) : channel_name; + const envelope_bytes = fs.readFileSync(path.join(__dirname, '../../fixtures/crypto-material/channel-config', channeltx_basename + '.tx'));const config = client.extractChannelConfig(envelope_bytes); t.pass('Successfully extracted the config update from the configtx envelope'); await testUtil.getSubmitter(client, t, true /* get the org admin*/, 'org1'); diff --git a/test/integration/e2e/e2eUtils.js b/test/integration/e2e/e2eUtils.js index 3f0890109d..85aa758290 100644 --- a/test/integration/e2e/e2eUtils.js +++ b/test/integration/e2e/e2eUtils.js @@ -210,7 +210,6 @@ function instantiateChaincodeWithId(userOrg, chaincode_id, chaincode_path, versi t.pass('Successfully retrieved TLS certificate'); tlsInfo = enrollment; client.setTlsClientCertAndKey(tlsInfo.certificate, tlsInfo.key); - return Client.newDefaultKeyValueStore({path: testUtil.storePathForOrg(orgName)}); }).then((store) => { diff --git a/test/integration/e2e/updateAnchorPeers.js b/test/integration/e2e/updateAnchorPeers.js index c1b7087318..ed9d0d995d 100644 --- a/test/integration/e2e/updateAnchorPeers.js +++ b/test/integration/e2e/updateAnchorPeers.js @@ -20,7 +20,7 @@ const _commonProto = ProtoLoader.load(path.resolve(__dirname, '../../../fabric-c const testUtil = require('../../unit/util.js'); const e2eUtils = require('./e2eUtils.js'); const channel_name = process.env.channel ? process.env.channel : 'mychannel';// can use "channel=" to control the channel name from command line -const anchorPeerTXFile = path.join(__dirname, '../../fixtures/channel/mychannel-org1anchor.tx'); +const anchorPeerTXFile = path.join(__dirname, '../../fixtures/crypto-material/channel-config/mychannel-org1anchor.tx'); const org = 'org1'; diff --git a/test/integration/memory.js b/test/integration/memory.js index a09c5ac48f..b40a210062 100644 --- a/test/integration/memory.js +++ b/test/integration/memory.js @@ -123,7 +123,7 @@ async function createChannel(t) { t.pass('Successfully created the key value store and crypto store based on the config and network config'); // get the config envelope created by the configtx tool - const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/channel/mychannel2.tx')); + const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/channel-config/mychannel.tx')); // have the sdk get the config update object from the envelope // the config update object is what is required to be signed by all // participating organizations diff --git a/test/integration/network-config.js b/test/integration/network-config.js index 9d240dee88..c25b36c8b0 100644 --- a/test/integration/network-config.js +++ b/test/integration/network-config.js @@ -123,7 +123,7 @@ test('\n\n***** use the connection profile file *****\n\n', async (t) => { client_org2.setTlsClientCertAndKey(cert, key); // get the config envelope created by the configtx tool - const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/channel/mychannel2.tx')); + const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/channel-config/mychannel2.tx')); // have the sdk get the config update object from the envelope generated by configtxgen // the config update object is what is required to be signed by all // participating organizations diff --git a/test/integration/network-e2e/config.json b/test/integration/network-e2e/config.json index c6e18c80fa..94dc07fe51 100644 --- a/test/integration/network-e2e/config.json +++ b/test/integration/network-e2e/config.json @@ -3,7 +3,7 @@ "orderer": { "url": "grpcs://localhost:7050", "server-hostname": "orderer.example.com", - "tls_cacerts": "../../fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem" + "tls_cacerts": "../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem" }, "org1": { "name": "peerOrg1", @@ -15,7 +15,7 @@ "peer1": { "requests": "grpcs://localhost:7051", "server-hostname": "peer0.org1.example.com", - "tls_cacerts": "../../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem" + "tls_cacerts": "../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem" } }, "org2": { @@ -28,7 +28,7 @@ "peer1": { "requests": "grpcs://localhost:8051", "server-hostname": "peer0.org2.example.com", - "tls_cacerts": "../../fixtures/channel/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem" + "tls_cacerts": "../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem" } } } diff --git a/test/integration/network-e2e/updateAnchorPeers.js b/test/integration/network-e2e/updateAnchorPeers.js index c72e7a14f7..44d4446916 100644 --- a/test/integration/network-e2e/updateAnchorPeers.js +++ b/test/integration/network-e2e/updateAnchorPeers.js @@ -15,7 +15,7 @@ const path = require('path'); const testUtil = require('../../unit/util.js'); const channel_name = testUtil.NETWORK_END2END.channel; -const anchorPeerTXFileOrg1 = path.join(__dirname, '../../fixtures/channel/mychannel-org1anchor.tx'); +const anchorPeerTXFileOrg1 = path.join(__dirname, '../../fixtures/crypto-material/channel-config/mychannel-org1anchor.tx'); test('\n\n***** Network End-to-end flow: setAnchorPeers *****\n\n', async (t) => { diff --git a/test/integration/only-admin.js b/test/integration/only-admin.js index 6ede60a16c..7259ec4c74 100644 --- a/test/integration/only-admin.js +++ b/test/integration/only-admin.js @@ -46,12 +46,12 @@ test('\n\n***** use only admin identity *****\n\n', async (t) => { async function manually(t, client) { try { - let data = fs.readFileSync(path.join(__dirname, '../fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/ef8e88d28a86f23466ad378003d819561adbedc77fe90cc250424ce4de179a3c_sk')); + let data = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem')); const key = data; const keyPem = Buffer.from(data).toString(); - data = fs.readFileSync(path.join(__dirname, '../fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem')); + data = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem')); const cert = Buffer.from(data).toString(); - data = fs.readFileSync(path.join(__dirname, '../fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem')); + data = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem')); const pem = Buffer.from(data).toString(); t.pass('Successfully read all crypto material'); diff --git a/test/integration/signTransactionOffline.js b/test/integration/signTransactionOffline.js index 94fce7da22..26e779d0e6 100644 --- a/test/integration/signTransactionOffline.js +++ b/test/integration/signTransactionOffline.js @@ -21,9 +21,9 @@ const {KEYUTIL} = jsrsa; const elliptic = require('elliptic'); const EC = elliptic.ec; -const privateKeyPath = path.resolve(__dirname, '../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/keystore/e4af7f90fa89b3e63116da5d278855cfb11e048397261844db89244549918731_sk'); +const privateKeyPath = path.resolve(__dirname, '../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem'); const privateKeyPem = fs.readFileSync(privateKeyPath, 'utf8'); -const certPath = path.resolve(__dirname, '../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/signcerts/User1@org1.example.com-cert.pem'); +const certPath = path.resolve(__dirname, '../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem'); const certPem = fs.readFileSync(certPath, 'utf8'); const mspId = 'Org1MSP'; @@ -110,7 +110,7 @@ async function setupChannel() { await TLSSetup(client); const channel = client.newChannel(channelId); - const peerTLSCertPath = path.resolve(__dirname, '../fixtures/channel/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem'); + const peerTLSCertPath = path.resolve(__dirname, '../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem'); const peerPEMCert = fs.readFileSync(peerTLSCertPath, 'utf8'); const peer = client.newPeer( 'grpcs://localhost:7051', @@ -119,7 +119,7 @@ async function setupChannel() { 'ssl-target-name-override': 'peer0.org1.example.com', } ); - const ordererTLSCertPath = path.resolve(__dirname, '../fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem'); + const ordererTLSCertPath = path.resolve(__dirname, '../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem'); const ordererPEMCert = fs.readFileSync(ordererTLSCertPath, 'utf8'); const orderer = client.newOrderer( 'grpcs://localhost:7050', diff --git a/test/scenario/config/ccp-tls.json b/test/scenario/config/ccp-tls.json index 7656e80e7d..6f2cbe609b 100644 --- a/test/scenario/config/ccp-tls.json +++ b/test/scenario/config/ccp-tls.json @@ -1,135 +1,120 @@ { - "name":"cucmber-network", - "description":"The network to be in if you like scenario tests, not vegetables", - "version":"1.0", - "client":{ - "organization":"Org1", - "credentialStore":{ - "path":"/tmp/hfc-kvs", - "cryptoStore":{ - "path":"/tmp/hfc-cvs" - }, - "wallet":"wallet-name" - } - }, - "channels":{ - "mychannel":{ - "orderers":[ - "orderer.example.com" - ], - "peers":{ - "peer0.org1.example.com":{ - "endorsingPeer":true, - "chaincodeQuery":true, - "ledgerQuery":true, - "eventSource":true - }, - "peer0.org2.example.com":{ - "endorsingPeer":true, - "chaincodeQuery":false, - "ledgerQuery":true, - "eventSource":false - } - }, - "chaincodes":[ - ] - } - }, - "organizations":{ - "Org1":{ - "mspid":"Org1MSP", - "peers":[ - "peer0.org1.example.com" - ], - "certificateAuthorities":[ - "ca-org1" - ], - "adminPrivateKeyPEM":{ - "path":"../config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/key.pem" - }, - "signedCertPEM":{ - "path":"../config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem" + "name":"cucumber-network", + "description":"The network to be in if you like scenario tests, not vegetables", + "version":"1.0", + "client":{ + "organization":"Org1", + "credentialStore":{ + "path":"/tmp/hfc-kvs", + "cryptoStore":{ + "path":"/tmp/hfc-cvs" + }, + "wallet":"wallet-name" } - }, - "Org2":{ - "mspid":"Org2MSP", - "peers":[ - "peer0.org2.example.com" - ], - "certificateAuthorities":[ - "ca-org2" - ], - "adminPrivateKeyPEM":{ - "path":"../config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/key.pem" - }, - "signedCertPEM":{ - "path":"../config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem" + }, + "channels":{ + "mychannel":{ + "orderers":[ + "orderer.example.com" + ], + "peers":{ + "peer0.org1.example.com":{ + "endorsingPeer":true, + "chaincodeQuery":true, + "ledgerQuery":true, + "eventSource":true + }, + "peer0.org2.example.com":{ + "endorsingPeer":true, + "chaincodeQuery":false, + "ledgerQuery":true, + "eventSource":false + } + }, + "chaincodes":[ + ] } - } - }, - "orderers":{ - "orderer.example.com":{ - "url":"grpcs://localhost:7050", - "mspid": "OrdererMSP", - "grpcOptions":{ - "ssl-target-name-override":"orderer.example.com" - }, - "tlsCACerts":{ - "path":"../config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem" + }, + "organizations":{ + "Org1":{ + "mspid":"Org1MSP", + "peers":[ + "peer0.org1.example.com" + ], + "certificateAuthorities":[ + "ca-org1" + ], + "adminPrivateKeyPEM":{ + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem" + }, + "signedCertPEM":{ + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem" + } }, - "adminPrivateKeyPEM":{ - "path":"../config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/key.pem" + "Org2":{ + "mspid":"Org2MSP", + "peers":[ + "peer0.org2.example.com" + ], + "certificateAuthorities":[ + "ca-org2" + ], + "adminPrivateKeyPEM":{ + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem" + }, + "signedCertPEM":{ + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem" + } + } + }, + "orderers":{ + "orderer.example.com":{ + "url":"grpcs://localhost:7050", + "mspid": "OrdererMSP", + "grpcOptions":{ + "ssl-target-name-override":"orderer.example.com" + }, + "tlsCACerts":{ + "path":"../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt" + }, + "adminPrivateKeyPEM":{ + "path":"../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem" + }, + "signedCertPEM":{ + "path":"../../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem" + } + } + }, + "peers":{ + "peer0.org1.example.com":{ + "url":"grpcs://localhost:7051", + "grpcOptions":{ + "ssl-target-name-override":"peer0.org1.example.com", + "request-timeout": 120001 + }, + "tlsCACerts":{ + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt" + } }, - "signedCertPEM":{ - "path":"../config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem" + "peer0.org2.example.com":{ + "url":"grpcs://localhost:8051", + "grpcOptions":{ + "ssl-target-name-override":"peer0.org2.example.com", + "request-timeout": 120001 + }, + "tlsCACerts":{ + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt" + } } - } - }, - "peers":{ - "peer0.org1.example.com":{ - "url":"grpcs://localhost:7051", - "grpcOptions":{ - "ssl-target-name-override":"peer0.org1.example.com", - "request-timeout": 120001 - }, - "tlsCACerts":{ - "path":"../config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem" - } - }, - "peer0.org2.example.com":{ - "url":"grpcs://localhost:8051", - "grpcOptions":{ - "ssl-target-name-override":"peer0.org2.example.com", - "request-timeout": 120001 - }, - "tlsCACerts":{ - "path":"../config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem" - } - } - }, - "certificateAuthorities":{ - "ca-org1":{ - "url":"https://localhost:7054", - "grpcOptions":{ - "verify":true - }, - "tlsCACerts":{ - "path":"../config/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem" - }, - "registrar":[ - { - "enrollId":"admin", - "enrollSecret":"adminpw" - } - ] - }, - "ca-org2":{ - "url":"https://localhost:8054", + }, + "certificateAuthorities":{ + "ca-org1":{ + "url":"https://localhost:7054", "grpcOptions":{ "verify":true }, "tlsCACerts":{ - "path":"../config/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem" + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem" }, "registrar":[ { @@ -137,6 +122,21 @@ "enrollSecret":"adminpw" } ] - } + }, + "ca-org2":{ + "url":"https://localhost:8054", + "grpcOptions":{ + "verify":true + }, + "tlsCACerts":{ + "path":"../../fixtures/crypto-material/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem" + }, + "registrar":[ + { + "enrollId":"admin", + "enrollSecret":"adminpw" + } + ] + } + } } -} diff --git a/test/scenario/config/crypto-config/adminconfig.tx b/test/scenario/config/crypto-config/adminconfig.tx deleted file mode 100644 index 54cf14cf46..0000000000 Binary files a/test/scenario/config/crypto-config/adminconfig.tx and /dev/null differ diff --git a/test/scenario/config/crypto-config/configtxgen.sh b/test/scenario/config/crypto-config/configtxgen.sh deleted file mode 100755 index d84daed9b8..0000000000 --- a/test/scenario/config/crypto-config/configtxgen.sh +++ /dev/null @@ -1,9 +0,0 @@ -# -# SPDX-License-Identifier: Apache-2.0 -# - -export FABRIC_CFG_PATH=$PWD -configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ./twoorgs.genesis.block -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./mychannel.tx -channelID mychannel -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./mychanneltx.tx -channelID mychanneltx -configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./adminconfig.tx -channelID adminconfig diff --git a/test/scenario/config/crypto-config/mychannelator.json b/test/scenario/config/crypto-config/mychannelator.json deleted file mode 100644 index e50c700e88..0000000000 --- a/test/scenario/config/crypto-config/mychannelator.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "channel_id": "mychannelator", - "read_set": { - "groups": { - "Application": { - "groups": { - "Org1MSP": {}, - "Org2MSP": {} - } - } - }, - "values": { - "Consortium": { - "value": { - "name": "SampleConsortium" - } - } - } - }, - "write_set": { - "groups": { - "Application": { - "groups": { - "Org1MSP": {}, - "Org2MSP": {} - }, - "mod_policy": "Admins", - "policies": { - "Admins": { - "mod_policy": "Admins", - "policy": { - "type": 3, - "value": { - "rule": "MAJORITY", - "sub_policy": "Admins" - } - } - }, - "Readers": { - "mod_policy": "Admins", - "policy": { - "type": 3, - "value": { - "sub_policy": "Readers" - } - } - }, - "Writers": { - "mod_policy": "Admins", - "policy": { - "type": 3, - "value": { - "sub_policy": "Writers" - } - } - } - }, - "version": "1" - } - }, - "values": { - "Consortium": { - "value": { - "name": "SampleConsortium" - } - } - } - } -} diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/ca/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/ca/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/ca/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/ca/key.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/ca/key.pem deleted file mode 100755 index 278a8edbc4..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/ca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgMOKUs/EytOuKG/kW -qZ8OHBb1aJ4zodJVqYWwcpH5FluhRANCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCU -PEe1Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQ ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index cb68b5959b..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-tls-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-tls-cert.pem deleted file mode 100644 index 604c9c35d4..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBcjCCARigAwIBAwICA+gwCgYIKoZIzj0EAwIwFjEUMBIGA1UEAwwLb3JkZXJl -ck9yZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjAWMRQwEgYDVQQD -DAtvcmRlcmVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK8Sv0EA9h06 -fmBkUCO+D/b/2INZ2huy+W/HCxSF22c7WGoJbRzQcWtQmW1KqZowUk86RcxVfFqv -jEMFVXzV38SjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFCVakuvq -xEcK8pYMf/Hw8hsexRMTMB8GA1UdIwQYMBaAFCVakuvqxEcK8pYMf/Hw8hsexRMT -MAoGCCqGSM49BAMCA0gAMEUCIQCmXgDSRTyxpSk+PXg0FNlYZ4ijTVwKgLkYVhod -zZPfngIgO4y0p3Fs/gNsJYrroKaaVDe955KrPp/O55jYDKAD/oY= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-tls-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-tls-cert.pem deleted file mode 100644 index ac4f5af8d4..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-tls-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-tls-cert.pem deleted file mode 100644 index d02884fa17..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/signcerts/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/signcerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/signcerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-tls-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-tls-cert.pem deleted file mode 100644 index 0309ef551f..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/example.com-tls-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNTCCAdygAwIBAgIRAPMzoI7K8QG4k7AzN7IhxhEwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xODAyMjExODQwMzJaFw0yODAyMTkxODQwMzJaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARXNh/8ySinCUnJi2T3 -cs4m3au0lHjallzAe6PcDz9++1bOl4CggAY0HxNov3nxtYoUJZcRhnE5an1PPipM -71hdo18wXTAOBgNVHQ8BAf8EBAMCAaYwDwYDVR0lBAgwBgYEVR0lADAPBgNVHRMB -Af8EBTADAQH/MCkGA1UdDgQiBCBQa5ovzv+NOu9CqfL/a885FjzDQZCg0D1kB+Oe -IdcBUTAKBggqhkjOPQQDAgNHADBEAiAZ7PcHMWpc2iu0dc43lwhq0wKLLVleCfgZ -JgRwdjw3wgIgMhcaHqv/W5MAudy9kjeJHIFembEJuWe/+krL6v//yw8= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-tls-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-tls-cert.pem deleted file mode 100644 index 886ecf1092..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org1.example.com-tls-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAN6NNLMddiNQbv9O9XXVtYkwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABDcanv4coQ10L/0jwxXuHcn8YtJEiqQRNSbKWLqf3/1mwYk8EEDHT4k9 -u1f+zS4T+qmSHSXbnFY+EN/ML5/1OGmjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJDbRSUVw/eK -6MzDHCybxAB60iGHBjtRkAIrOcT3xytTMAoGCCqGSM49BAMCA0cAMEQCIAGAMw2G -Kn0n52XceSFMyioH4Uo0dpkYaxKFk0P9vBTTAiBd0AQ0WFc/w1wuaShK3hWNg9Ey -F9kotvRE5Hu0gweb1w== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-tls-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-tls-cert.pem deleted file mode 100644 index 76d7be38cd..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/org2.example.com-tls-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAMXlqdLr7+td1aShJFAZungwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABO7WAyDbk/B2w9mmauuRSlOwFL1crwmiu9oDu83/Veh9ghrNRsbK2chV -j5PoY+H5PlRbqA8ZdbmDhHhDho9KBqejXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO+KUPKtAXWt -BPdjC4N80Yys3wJ9i4/mxz1ikCFJ890EMAoGCCqGSM49BAMCA0cAMEQCID4dOXH8 -6ginPTS17oyyowkdM34Z5ATPdA7WytfA8IW+AiA0jguTMYimuWEWuTulOgyNZ3ai -hzFkzY/dm7duN86yJQ== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/admincerts/Admin@example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index cb68b5959b..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/cacerts/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/cacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/cacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/keystore/key.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/keystore/key.pem deleted file mode 100755 index 9f83a878a0..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0D9/qySG+JbELX4u -WYxknY5CP4p6sVnetkfHGs7WBW+hRANCAATcybHflJqj6M8vzGCT30gfoZBPpbiP -jp4GgIOUHbiIuHz7y5I480+1YY++JcbS6nDZCh2EJRhFAQ5ZtJZLbbHO ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/signcerts/orderer.example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/signcerts/orderer.example.com-cert.pem deleted file mode 100644 index 7501ca153b..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/signcerts/orderer.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHzCCAcWgAwIBAgIRANzg3GjG7MdyBWTlVQ42QbAwCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFgxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI -zj0DAQcDQgAE3Mmx35Sao+jPL8xgk99IH6GQT6W4j46eBoCDlB24iLh8+8uSOPNP -tWGPviXG0upw2QodhCUYRQEOWbSWS22xzqNiMGAwDgYDVR0PAQH/BAQDAgWgMBMG -A1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg6q3l -kIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt6c4wCgYIKoZIzj0EAwIDSAAwRQIh -APf6n3hu/VwDz0N3GeJrsfksmq6ZRJ74NgKL7jHpNtsvAiALjSzODY+s48c5rF+A -Kn4JjmSH4UlcXcRGBsQpP+qXfg== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/admincerts/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/admincerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/admincerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/cacerts/example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/cacerts/example.com-cert.pem deleted file mode 100644 index b151531181..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/cacerts/example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/key.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/key.pem deleted file mode 100755 index 7cc31b4915..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgKi/7SbU0tzemhB4/ -gZY1pts4cjYsrMTL7SSGkDSpSkahRANCAASkearIgWkEsdLMtSv+xBaQSQ3lTwun -C236iI47aLLjHzTYw61UfV/LPnTy3lm1D+aiZlpxNZGfydFsk56kWygN ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem b/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem deleted file mode 100644 index cb68b5959b..0000000000 --- a/test/scenario/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/ca/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/ca/key.pem deleted file mode 100755 index 7f4833522f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/ca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7hAb34OQ5le9208+ -LC0V5mvjS9223gy8/LWaHy+bnUWhRANCAAS4ud+Na5q4hhRwplUy3YDxqQxUYMIJ -h0ri2sjLBj9MhJrF4d4SgMtuH9Zo8f7fFk/RtrAHcDjbD7HyjEgiqWka ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 0797d01c88..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-tls-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-tls-cert.pem deleted file mode 100644 index ac4f5af8d4..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org1.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org2.example.com-tls-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org2.example.com-tls-cert.pem deleted file mode 100644 index d02884fa17..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/org2.example.com-tls-cert.pem +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/signcerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/signcerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/signcerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/admincerts/Admin@org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 0797d01c88..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/cacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/keystore/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/keystore/key.pem deleted file mode 100755 index 50c8b1e6be..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg+tWlPzRwoknNCHmn -QIw/DiQ5WXOoq8TbclyNz8CwApChRANCAAQlWnZyzstbrL/UpBdf/zB6G2yydJgY -AWRytAhXEGMAXXw/RpneaJNpZlUgGOJ0q47IUTKzRvlr6vK31kyULKJK ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/signcerts/peer0.org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/signcerts/peer0.org1.example.com-cert.pem deleted file mode 100644 index f02881d90f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/signcerts/peer0.org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLDCCAdKgAwIBAgIRALLqpJNBvjJnfDisCe33w6wwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBb -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMS5leGFtcGxlLmNvbTBZMBMG -ByqGSM49AgEGCCqGSM49AwEHA0IABCVadnLOy1usv9SkF1//MHobbLJ0mBgBZHK0 -CFcQYwBdfD9Gmd5ok2lmVSAY4nSrjshRMrNG+Wvq8rfWTJQsokqjYjBgMA4GA1Ud -DwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsG -A1UdIwQkMCKAIKItrzVrKqtXkupT419m/M7x1/GqKzorktv7+WpEjqJqMAoGCCqG -SM49BAMCA0gAMEUCIQCHf6KuKNKDY65EEzxh2hg8Nxx33d35wUX5H9GkjtnphQIg -X2qGwCc+YoPDg+8JZmRlZ0zAy/6dWiY0xzVJ3/CMbYI= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/cert.pem deleted file mode 100644 index 5403e6cdb6..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/cert.pem +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfzCCAiWgAwIBAgIUNAqZVk9s5/HR7k30feNp8DrYbK4wCgYIKoZIzj0EAwIw -cDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh -biBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMT -EG9yZzEuZXhhbXBsZS5jb20wHhcNMTgwMjI2MjAwOTAwWhcNMTkwMjI2MjAxNDAw -WjBdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExFDASBgNV -BAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZjbGllbnQxDjAMBgNVBAMTBWFkbWlu -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEz05miTKv6Vz+qhc5362WIZ44fs/H -X5m9zDOifle5HIjt4Usj+TiUgT1hpbI8UI9pueWhbrZpZXlX6+mImi52HaOBrzCB -rDAOBgNVHQ8BAf8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPnxMtT6jgYsMAgI38ponGs8sgbqMCsG -A1UdIwQkMCKAIKItrzVrKqtXkupT419m/M7x1/GqKzorktv7+WpEjqJqMCEGA1Ud -EQQaMBiCFnBlZXIwLm9yZzEuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSAAwRQIh -AM1JowZMshCRs6dnOfRmUHV7399KnNvs5QoNw93cuQuAAiBtBEGh1Xt50tZjDcYN -j+yx4IraL4JvMrCHbR5/R+Xo1Q== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/key.pem deleted file mode 100755 index ddc6db8ae1..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgbTXpl4NGXuPtSC/V -PTVNGVBgVv8pZ6kGktVcnQD0KiKhRANCAATPTmaJMq/pXP6qFznfrZYhnjh+z8df -mb3MM6J+V7kciO3hSyP5OJSBPWGlsjxQj2m55aFutmlleVfr6YiaLnYd ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tlscacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/admincerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/admincerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/admincerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/cacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/key.pem deleted file mode 100755 index fe50ae38bc..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgS0L+WeTBa4vdUW4j -rogLu8JmLSjda0YcA2TWOfaR+8yhRANCAAQO41JsWQE2pt2UZ/DBdIcpa/inDZ4U -54P5VcIdXgISsEqdRcGLBz+cvvrpTNedaeyNRSndk5LMIJ/npw2Qua/p ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 0797d01c88..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/signcerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/admincerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/admincerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/admincerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/cacerts/org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/cacerts/org1.example.com-cert.pem deleted file mode 100644 index 527a90e8a0..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/cacerts/org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/keystore/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/keystore/key.pem deleted file mode 100755 index 6554d7b6c7..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQglAOKVjiJSAYj5KnC -vmX99WJhlSwjZ07F8a+gohlPOKihRANCAARVCrjQpYsFfROLZkm1lnd7b/+GROpO -AhiImGijSYx2COmFY5UzBJdja7ElnDjGdWsrPvcSdhMI7ELw2omQZyT3 ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/signcerts/User1@org1.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/signcerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 33e53db9cd..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/signcerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLDCCAdKgAwIBAgIRAKZHheCZPE+GMLRV2WXBr10wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBb -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMS5leGFtcGxlLmNvbTBZMBMG -ByqGSM49AgEGCCqGSM49AwEHA0IABFUKuNCliwV9E4tmSbWWd3tv/4ZE6k4CGIiY -aKNJjHYI6YVjlTMEl2NrsSWcOMZ1ays+9xJ2EwjsQvDaiZBnJPejYjBgMA4GA1Ud -DwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsG -A1UdIwQkMCKAIKItrzVrKqtXkupT419m/M7x1/GqKzorktv7+WpEjqJqMAoGCCqG -SM49BAMCA0gAMEUCIQD3hsHS1DS9Ox7tq46p7x0QWP9yc++M7XA7PRf8L7wX/QIg -U0LdIXJrhxAXX29tC/qG2QGPA4T5QTCKZZcVNaAT/LQ= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/ca/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/ca/key.pem deleted file mode 100755 index 0023b96e4f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/ca/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgTevmjSx6rk995Flz -Z1lLWbSCPnpkV2+H6+0fbLHgGxehRANCAAQ6GE1wdDI/Y/oklMjNbO22WVWw5j+7 -U3o9KljaUtSuz0bEDtoU30rosEK86Wk7hieFED2ILvZkySk1shFVkNqU ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/ca/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 273d43d183..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/signcerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/signcerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/signcerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/admincerts/Admin@org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 273d43d183..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/cacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/keystore/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/keystore/key.pem deleted file mode 100755 index cb4c08d36a..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgjlkrze8DhYt8LpCh -kXJyUr6HOp9Jga5RXoOMPFC+J0yhRANCAARYOh3QPZB39zR+JKqVHD+NZqGwMSa3 -05zPyTod7ySx+qbXOXQOZo9AxX9eg7alhlQrSniME8YZIucNANKTEMp0 ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/signcerts/peer0.org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/signcerts/peer0.org2.example.com-cert.pem deleted file mode 100644 index da45859abb..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/signcerts/peer0.org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLDCCAdKgAwIBAgIRAOvtY/+3TfiQKgN49CsrpLEwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBb -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMi5leGFtcGxlLmNvbTBZMBMG -ByqGSM49AgEGCCqGSM49AwEHA0IABFg6HdA9kHf3NH4kqpUcP41mobAxJrfTnM/J -Oh3vJLH6ptc5dA5mj0DFf16DtqWGVCtKeIwTxhki5w0A0pMQynSjYjBgMA4GA1Ud -DwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsG -A1UdIwQkMCKAIEZNVQ/pv559iXbN9Z0aXUclmPVMBYw1RjF8XF+w3f1uMAoGCCqG -SM49BAMCA0gAMEUCIQC2FP9CW85/5dwQ0/4perHKGYaL2h/pZKpZTvlqA6AjdwIg -bee43v7a0+TqKkvI41rW6L5l+scxf9R+1Dp2s8UASus= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/cert.pem deleted file mode 100644 index 93c4cc43f8..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/cert.pem +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfzCCAiWgAwIBAgIUP10YV9H0k3awYvx/YQGbt4xSU0gwCgYIKoZIzj0EAwIw -cDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh -biBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMT -EG9yZzIuZXhhbXBsZS5jb20wHhcNMTgwMjI2MjAxMDAwWhcNMTkwMjI2MjAxNTAw -WjBdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExFDASBgNV -BAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZjbGllbnQxDjAMBgNVBAMTBWFkbWlu -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4tZMwelomMmJuRuX2z2f+LzSK4vS -VwCxQezCUADzEbImVknEXbL0OGf+JfXFhdyer7NRu05ErU9DbW9dkvBJeaOBrzCB -rDAOBgNVHQ8BAf8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFE9WIFRHLVEBLb1cLkfly9pIPd5XMCsG -A1UdIwQkMCKAIEZNVQ/pv559iXbN9Z0aXUclmPVMBYw1RjF8XF+w3f1uMCEGA1Ud -EQQaMBiCFnBlZXIwLm9yZzIuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSAAwRQIh -AM6xI6LLT/P75KefAeP6Lmh0Ih0onbh5KeE6IbDVYOItAiBaRJ1z7aMUHy/ve5jb -TMhvWNDb463/VdvupdJ+o5J73w== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/key.pem deleted file mode 100755 index d844789eb1..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2tjri0pHTTlGOt1n -EwgqxdqIfgpZdMIsnO2dLTX2qKOhRANCAATi1kzB6WiYyYm5G5fbPZ/4vNIri9JX -ALFB7MJQAPMRsiZWScRdsvQ4Z/4l9cWF3J6vs1G7TkStT0Ntb12S8El5 ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tlscacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/admincerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/admincerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/admincerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/cacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/key.pem deleted file mode 100755 index 5953ddb1a4..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9cyRkWbKn8mFu2/H -HxMneHaDJgUIYD1NNMill5Etb9uhRANCAAT8vNxSBryBW63biAsRd8QIBMVBRlnD -e5Vi8wt+p58NASoDu/XYN38NRJa9MbM4JHbCkVSpf3OJ1HQRRqOqc6Xg ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 273d43d183..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/signcerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/admincerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/admincerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/admincerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/cacerts/org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/cacerts/org2.example.com-cert.pem deleted file mode 100644 index 8ebfe2531f..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/cacerts/org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/keystore/key.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/keystore/key.pem deleted file mode 100755 index 6d633fec79..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/keystore/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0ToCLZ9mCaZovZpA -/5MZqxjfuZBbyLVftjP/Wsji9tmhRANCAAR2xaWMIy41g2N9svC/4bFtEYYSdwf9 -RdGSgYZn1WDbOpAUl1g9Ro7Ys4JkFrRqdbg8V8RPtmcJGFJbZVPfOx9h ------END PRIVATE KEY----- diff --git a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/signcerts/User1@org2.example.com-cert.pem b/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/signcerts/User1@org2.example.com-cert.pem deleted file mode 100644 index 62b830c180..0000000000 --- a/test/scenario/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/signcerts/User1@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIQLKJhtKqqMCGzcyWeO+oNVDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEdsWljCMuNYNjfbLwv+GxbRGGEncH/UXRkoGG -Z9Vg2zqQFJdYPUaO2LOCZBa0anW4PFfET7ZnCRhSW2VT3zsfYaNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDSAAwRQIhAN6yovenryWzuNLg7/tWVlAuVIfEcMNXzsPqkDnjZ62+AiAN -T8K300zijaLfUoeyxNiNclT3JAhNjNxPkYkRKVb/6A== ------END CERTIFICATE----- diff --git a/test/scenario/config/crypto-config/rename.sh b/test/scenario/config/crypto-config/rename.sh deleted file mode 100755 index 6731f3ef70..0000000000 --- a/test/scenario/config/crypto-config/rename.sh +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -# 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 - KEY_DIR=$(dirname ${KEY}) - mv ${KEY} ${KEY_DIR}/key.pem -done diff --git a/test/scenario/config/crypto-config/twoorgs.genesis.block b/test/scenario/config/crypto-config/twoorgs.genesis.block deleted file mode 100644 index 79773c1a73..0000000000 --- a/test/scenario/config/crypto-config/twoorgs.genesis.block +++ /dev/null @@ -1,372 +0,0 @@ - -" %,|Vt(x=dbU ̽ - - -y -[쳶" testchainid*@cdad2d7a639cab769332bf889e0f4bc59a5db7e21c21441783a4d6bd7d10b7adjL"w{K?7Ӹ6 -S -OrdererSP - -OrdererMSPPO -MSPOOO - -OrdererMSP-----BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBcjCCARigAwIBAwICA+gwCgYIKoZIzj0EAwIwFjEUMBIGA1UEAwwLb3JkZXJl -ck9yZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjAWMRQwEgYDVQQD -DAtvcmRlcmVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK8Sv0EA9h06 -fmBkUCO+D/b/2INZ2huy+W/HCxSF22c7WGoJbRzQcWtQmW1KqZowUk86RcxVfFqv -jEMFVXzV38SjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFCVakuvq -xEcK8pYMf/Hw8hsexRMTMB8GA1UdIwQYMBaAFCVakuvqxEcK8pYMf/Hw8hsexRMT -MAoGCCqGSM49BAMCA0gAMEUCIQCmXgDSRTyxpSk+PXg0FNlYZ4ijTVwKgLkYVhod -zZPfngIgO4y0p3Fs/gNsJYrroKaaVDe955KrPp/O55jYDKAD/oY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- -"-----BEGIN CERTIFICATE----- -MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ -dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV -HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH -xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj -Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ -VfRO4IGE/M3rSnpBrQCodA== ------END CERTIFICATE----- -B -SHA2SHA256J-----BEGIN CERTIFICATE----- -MIICNDCCAdqgAwIBAgIRAIBOtq8vZiC0+uLSi2MIS4swCgYIKoZIzj0EAwIwZjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl -LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMGYxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv -MRQwEgYDVQQKEwtleGFtcGxlLmNvbTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTAT -BgcqhkjOPQIBBggqhkjOPQMBBwNCAARD2rvgyAmhn8hpu82kAjX3QUg2iqCUPEe1 -Q5CzD5MVv/dK5wrRgkcoMhJLe4HPxYbjV3rodm5Pwi5m3zMGkqNQo2kwZzAOBgNV -HQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYDVR0TAQH/ -BAUwAwEB/zApBgNVHQ4EIgQg6q3lkIfG2X/PNQ6U83rZ8saSu2bxghSM5YlA3nCt -6c4wCgYIKoZIzj0EAwIDSAAwRQIhAL5Lgy7jZ2W74L6i0B23a3JD0W8TSYlTcqXb -RMSXlLIoAiB2glBl0wM/ITn5+tnHOnq2wrIGuYIiNbLK5oq2zf+gtA== ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICNTCCAdygAwIBAgIRAPMzoI7K8QG4k7AzN7IhxhEwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xODAyMjExODQwMzJaFw0yODAyMTkxODQwMzJaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARXNh/8ySinCUnJi2T3 -cs4m3au0lHjallzAe6PcDz9++1bOl4CggAY0HxNov3nxtYoUJZcRhnE5an1PPipM -71hdo18wXTAOBgNVHQ8BAf8EBAMCAaYwDwYDVR0lBAgwBgYEVR0lADAPBgNVHRMB -Af8EBTADAQH/MCkGA1UdDgQiBCBQa5ovzv+NOu9CqfL/a885FjzDQZCg0D1kB+Oe -IdcBUTAKBggqhkjOPQQDAgNHADBEAiAZ7PcHMWpc2iu0dc43lwhq0wKLLVleCfgZ -JgRwdjw3wgIgMhcaHqv/W5MAudy9kjeJHIFembEJuWe/+krL6v//yw8= ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAN6NNLMddiNQbv9O9XXVtYkwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABDcanv4coQ10L/0jwxXuHcn8YtJEiqQRNSbKWLqf3/1mwYk8EEDHT4k9 -u1f+zS4T+qmSHSXbnFY+EN/ML5/1OGmjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJDbRSUVw/eK -6MzDHCybxAB60iGHBjtRkAIrOcT3xytTMAoGCCqGSM49BAMCA0cAMEQCIAGAMw2G -Kn0n52XceSFMyioH4Uo0dpkYaxKFk0P9vBTTAiBd0AQ0WFc/w1wuaShK3hWNg9Ey -F9kotvRE5Hu0gweb1w== ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- -J-----BEGIN CERTIFICATE----- -MIICSTCCAfCgAwIBAgIRAMXlqdLr7+td1aShJFAZungwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgwMjIxMTg0MDMyWhcNMjgwMjE5MTg0 -MDMyWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABO7WAyDbk/B2w9mmauuRSlOwFL1crwmiu9oDu83/Veh9ghrNRsbK2chV -j5PoY+H5PlRbqA8ZdbmDhHhDho9KBqejXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIO+KUPKtAXWt -BPdjC4N80Yys3wJ9i4/mxz1ikCFJ890EMAoGCCqGSM49BAMCA0cAMEQCID4dOXH8 -6ginPTS17oyyowkdM34Z5ATPdA7WytfA8IW+AiA0jguTMYimuWEWuTulOgyNZ3ai -hzFkzY/dm7duN86yJQ== ------END CERTIFICATE----- -Admins"4 -Admins*  - -OrdererMSPAdmins"3 -Readers( - -OrdererMSPAdmins"3 -Writers( - -OrdererMSPAdmins*Admins! - ConsensusType -soloAdmins" - BatchSize  -1 Admins! - BatchTimeout -500msAdmins -ChannelRestrictionsAdmins$ - Capabilities - - -V1_1Admins"" -Readers  -ReadersAdmins"" -Writers  -WritersAdmins"" -Admins - -AdminsAdmins"* -BlockValidation  -WritersAdmins*Admins5 - Consortiums54 -SampleConsortium4 -Org1MSP -MSP -Org1MSP-----BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzAwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKJfDc/CcaiHRipTG2AB -K5fA0LO9SOlbtC9bZcjLo/xsL157p+3QB3UVF3gt7nkwgMs/ul3FhSEFTk2EVNlF -1QCjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFQzuQR1RZP/Qn/B -NDtGSa8n4eN/MB8GA1UdIwQYMBaAFFQzuQR1RZP/Qn/BNDtGSa8n4eN/MAoGCCqG -SM49BAMCA0gAMEUCIAuG+/Fy3x9JXAD1/rFsu3ZpCKbXiXZLGF7P6Gma8is5AiEA -pSQpRcdukxe4zvcfRmNBjMbNLWCoWlHSQA2jD678QGE= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBbDCCARKgAwIBAwICA+gwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwIcGVlck9y -ZzEwHhcNMTcwMjIwMTkwNjEwWhcNMTgwMjIwMTkwNjEwWjATMREwDwYDVQQDDAhw -ZWVyT3JnMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ2S+UvyFgFZYL6qcrKo -zy72Nkc/RQVzg1VfwC3X7QcnHEVBuCzba1nxdDVE8XPnhmKBWLKh0adn6GKUZpyf -mbKjVjBUMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAQlMVsXlKGMEWPf -KMMM6QVASnlPMB8GA1UdIwQYMBaAFAQlMVsXlKGMEWPfKMMM6QVASnlPMAoGCCqG -SM49BAMCA0gAMEUCIHr4AD6Xx3R6zFCsveIMnWao9Us88/0uGHoT4ELmMhA1AiEA -yzfXU5qHp3xBJ1BrKOGi71UmQZVwWfO26INhxcfpCAg= ------END CERTIFICATE----- -"-----BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQIVQ6HvVnJP1qZ5YKfh50hzAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -MS5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAEDuNSbFkBNqbdlGfwwXSHKWv4pw2eFOeD+VXC -HV4CErBKnUXBiwc/nL766UzXnWnsjUUp3ZOSzCCf56cNkLmv6aNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgoi2vNWsqq1eS6lPjX2b8zvHX8aorOiuS2/v5akSOomowCgYIKoZI -zj0EAwIDRwAwRAIgbEqKoKrFuYQG0ndiX7dT7GKGlF17Skf8DYil9cqbp00CID5T -URQPp0/vJ3tldK0z9xjFvsSecj8aqnDvZvGz07/v ------END CERTIFICATE----- -B -SHA2SHA256J-----BEGIN CERTIFICATE----- -MIICSDCCAe6gAwIBAgIRAPnKpS42wlgtHsddm6q+kYcwCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzEuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABLi5341r -mriGFHCmVTLdgPGpDFRgwgmHSuLayMsGP0yEmsXh3hKAy24f1mjx/t8WT9G2sAdw -ONsPsfKMSCKpaRqjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCCiLa81ayqrV5Lq -U+NfZvzO8dfxqis6K5Lb+/lqRI6iajAKBggqhkjOPQQDAgNIADBFAiEAr8LYCY2b -q5kNqOUxgHwBa2KTi/zJBR9L3IsTRDjJo8ECICf1xiDgKqZKrAMh0OCebskYwf53 -dooG04HBoqBLvB8Q ------END CERTIFICATE----- -Admins"0 -Readers%  -Org1MSPAdmins"0 -Writers%  -Org1MSPAdmins"1 -Admins'  -Org1MSPAdmins*Admins -Org2MSP -MSP -Org2MSP-----BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- -"-----BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIQAjgHxmmRePMUA7W89J4iJDAKBggqhkjOPQQDAjBwMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQb3Jn -Mi5leGFtcGxlLmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFsx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4g -RnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29tMFkwEwYH -KoZIzj0CAQYIKoZIzj0DAQcDQgAE/LzcUga8gVut24gLEXfECATFQUZZw3uVYvML -fqefDQEqA7v12Dd/DUSWvTGzOCR2wpFUqX9zidR0EUajqnOl4KNiMGAwDgYDVR0P -AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgRk1VD+m/nn2Jds31nRpdRyWY9UwFjDVGMXxcX7Dd/W4wCgYIKoZI -zj0EAwIDRwAwRAIgBweV4tP8pYd4osOWIawmQTD4oqXtpp3F8y1g85Qz1BICIE8E -VNeXeNlxRoUdToSMOBHSJE0EVqK4BP4NXibBJSgH ------END CERTIFICATE----- -B -SHA2SHA256J-----BEGIN CERTIFICATE----- -MIICRzCCAe6gAwIBAgIRAO33HJTheTwvBgWroB6JK40wCgYIKoZIzj0EAwIwcDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xGTAXBgNVBAMTEG9y -ZzIuZXhhbXBsZS5jb20wHhcNMTcwNDIyMTIwMjU2WhcNMjcwNDIwMTIwMjU2WjBw -MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu -IEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEZMBcGA1UEAxMQ -b3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDoYTXB0 -Mj9j+iSUyM1s7bZZVbDmP7tTej0qWNpS1K7PRsQO2hTfSuiwQrzpaTuGJ4UQPYgu -9mTJKTWyEVWQ2pSjaTBnMA4GA1UdDwEB/wQEAwIBpjAZBgNVHSUEEjAQBgRVHSUA -BggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBGTVUP6b+efYl2 -zfWdGl1HJZj1TAWMNUYxfFxfsN39bjAKBggqhkjOPQQDAgNHADBEAiB2XoqoNSRw -YzY6sgomVYtidm7HwiXEsqkrThUHasnOugIgejAgkgXWid6WEdFSAUVpEDsRiek4 -nM2KGw+XJ5/pm/Q= ------END CERTIFICATE----- -Admins"0 -Writers%  -Org2MSPAdmins"1 -Admins'  -Org2MSPAdmins"0 -Readers%  -Org2MSPAdmins*Admins@ -ChannelCreationPolicy'  -Admins/Channel/Orderer/Admins*/Channel/Orderer/Admins"- -Admins#/Channel/Orderer/Admins*/Channel/Orderer/Admins& -HashingAlgorithm -SHA256Admins- -BlockDataHashingStructureAdminsI -OrdererAddresses5 -orderer.example.com:7050/Channel/Orderer/Admins$ - Capabilities - - -V1_1Admins"" -Writers  -WritersAdmins"" -Admins - -AdminsAdmins"" -Readers  -ReadersAdmins*Admins - - - - \ No newline at end of file diff --git a/test/scenario/docker-compose/docker-compose-tls.yaml b/test/scenario/docker-compose/docker-compose-tls.yaml deleted file mode 100644 index 1a1390ade1..0000000000 --- a/test/scenario/docker-compose/docker-compose-tls.yaml +++ /dev/null @@ -1,139 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -version: '2' - -services: - - ca0.example.com: - extends: - file: docker-compose-base.yaml - service: ca0 - container_name: ca0.example.com - environment: - - FABRIC_CA_SERVER_TLS_ENABLED=true - - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org1.example.com-cert.pem - - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/key.pem - - ca1.example.com: - extends: - file: docker-compose-base.yaml - service: ca1 - container_name: ca1.example.com - environment: - - FABRIC_CA_SERVER_TLS_ENABLED=true - - FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/org2.example.com-cert.pem - - FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/key.pem - - orderer.example.com: - extends: - file: docker-compose-base.yaml - service: orderer - container_name: orderer.example.com - environment: - - ORDERER_GENERAL_TLS_ENABLED=true - - ORDERER_GENERAL_TLS_CLIENTAUTHREQUIRED=true - - ORDERER_GENERAL_TLS_PRIVATEKEY=/etc/hyperledger/msp/orderer/keystore/key.pem - - ORDERER_GENERAL_TLS_CERTIFICATE=/etc/hyperledger/msp/orderer/signcerts/orderer.example.com-cert.pem - - ORDERER_GENERAL_TLS_ROOTCAS=[/etc/hyperledger/msp/orderer/cacerts/example.com-cert.pem, /etc/hyperledger/msp/peerOrg1/cacerts/org1.example.com-cert.pem, /etc/hyperledger/msp/peerOrg2/cacerts/org2.example.com-cert.pem] - - ORDERER_GENERAL_TLS_CLIENTROOTCAS=[/etc/hyperledger/msp/orderer/cacerts/example.com-cert.pem, /etc/hyperledger/msp/peerOrg1/cacerts/org1.example.com-cert.pem, /etc/hyperledger/msp/peerOrg2/cacerts/org2.example.com-cert.pem] - - peer0.org1.example.com: - extends: - file: docker-compose-base.yaml - service: peer - container_name: peer0.org1.example.com - environment: - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_PEER_ID=peer0.org1.example.com - - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_LISTENADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/ - - - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb.org1.example.com:5984 - - ## Enable TLS - - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/msp/peer/tls/key.pem - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/msp/peer/tls/cert.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/msp/peer/cacerts/org1.example.com-cert.pem - - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/msp/peer/cacerts/org1.example.com-cert.pem - - ports: - - 7051:7051 - volumes: - - /var/run/:/host/var/run/ - - ../config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peer - depends_on: - - orderer.example.com - - couchdb.org1.example.com - - couchdb.org1.example.com: - extends: - file: docker-compose-base.yaml - service: couchdb - container_name: couchdb.org1.example.com - ports: - - 5984:5984 - environment: - DB_URL: http://localhost:5984/member_db - - peer0.org2.example.com: - extends: - file: docker-compose-base.yaml - service: peer - container_name: peer0.org2.example.com - - environment: - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_PEER_ID=peer0.org2.example.com - - CORE_PEER_ADDRESS=peer0.org2.example.com:8051 - - CORE_PEER_LISTENADDRESS=peer0.org2.example.com:8051 - - CORE_PEER_GOSSIP_ENDPOINT=peer0.org2.example.com:8051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:8051 - - CORE_PEER_LOCALMSPID=Org2MSP - - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/ - - - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb.org2.example.com:5984 - - ## Enable TLS - - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/msp/peer/tls/key.pem - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/msp/peer/tls/cert.pem - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/msp/peer/cacerts/org2.example.com-cert.pem - - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/etc/hyperledger/msp/peer/cacerts/org2.example.com-cert.pem - ports: - - 8051:8051 - volumes: - - /var/run/:/host/var/run/ - - ../config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/:/etc/hyperledger/msp/peer - depends_on: - - orderer.example.com - - couchdb.org2.example.com - - couchdb.org2.example.com: - extends: - file: docker-compose-base.yaml - service: couchdb - container_name: couchdb.org2.example.com - ports: - - 6984:5984 - environment: - DB_URL: http://localhost:5984/member_db diff --git a/test/scenario/features/lib/channel.js b/test/scenario/features/lib/channel.js index 24005385e6..e0dfad4bef 100644 --- a/test/scenario/features/lib/channel.js +++ b/test/scenario/features/lib/channel.js @@ -12,12 +12,12 @@ const fs = require('fs'); /** * Create the channels located in the given common connection profile. - * @param {string} configPath The path to the Fabric network common connection profile and associated data. + * @param {string} channelTxPath The path to where the channel tx block lives * @param {CommonConnectionProfile} ccp The common connection profile * @param {Boolean} tls Boolean true if tls network; false if not * @return {Promise} The return promise. */ -async function create_channels(configPath, ccp, tls) { +async function create_channels(channelTxPath, ccp, tls) { Client.setConfigSetting('request-timeout', 60000); const channels = ccp.getChannels(); if (!Object.keys(channels) || Object.keys(channels).length === 0) { @@ -70,7 +70,7 @@ async function create_channels(configPath, ccp, tls) { await testUtil.getOrdererAdmin(client, ordererName, ccp); // use the config update created by the configtx tool - const envelope_bytes = fs.readFileSync((path.join(configPath, 'crypto-config', channelName + '.tx'))); + const envelope_bytes = fs.readFileSync((path.join(channelTxPath, channelName + '.tx'))); config = client.extractChannelConfig(envelope_bytes); // sign the config for each org diff --git a/test/scenario/features/steps/admin_steps.js b/test/scenario/features/steps/admin_steps.js index 741a3a0d82..5822a6ba74 100644 --- a/test/scenario/features/steps/admin_steps.js +++ b/test/scenario/features/steps/admin_steps.js @@ -11,20 +11,22 @@ const testUtil = require('../lib/utils'); const path = require('path'); +const cryptoRoot = '../../../fixtures/crypto-material'; const configRoot = '../../config'; -const ccpPath = '../../config/ccp.json'; -const tlsCcpPath = '../../config/ccp-tls.json'; -const policiesPath = '../../config/policies.json'; +const channelRoot = cryptoRoot + '/channel-config'; +const ccpPath = configRoot + '/ccp.json'; +const tlsCcpPath = configRoot + '/ccp-tls.json'; +const policiesPath = configRoot + '/policies.json'; module.exports = function () { this.Then(/^I can create a channels from the (.+?) common connection profile$/, {timeout: testUtil.TIMEOUTS.SHORT_STEP}, async (tlsType) => { if (tlsType.localeCompare('non-tls') === 0) { const profile = new CCP(path.join(__dirname, ccpPath), true); - return channel_util.create_channels(path.join(__dirname, configRoot), profile, false); + return channel_util.create_channels(path.join(__dirname, channelRoot), profile, false); } else { const profile = new CCP(path.join(__dirname, tlsCcpPath), true); - return channel_util.create_channels(path.join(__dirname, configRoot), profile, true); + return channel_util.create_channels(path.join(__dirname, channelRoot), profile, true); } }); @@ -50,7 +52,7 @@ module.exports = function () { profile = new CCP(path.join(__dirname, tlsCcpPath), true); } - await channel_util.create_channels(path.join(__dirname, configRoot), profile, tls); + await channel_util.create_channels(path.join(__dirname, channelRoot), profile, tls); const channels = profile.getChannels(); try { diff --git a/test/scenario/features/steps/docker_steps.js b/test/scenario/features/steps/docker_steps.js index 2bf865cc3c..98e8caccee 100644 --- a/test/scenario/features/steps/docker_steps.js +++ b/test/scenario/features/steps/docker_steps.js @@ -12,12 +12,11 @@ module.exports = function () { this.Given(/^I have deployed a (.+?) Fabric network/, {timeout: testUtil.TIMEOUTS.LONG_STEP}, async (type) => { await testUtil.runShellCommand(undefined, 'docker kill $(docker ps -aq); docker rm $(docker ps -aq)'); if (type.localeCompare('non-tls') === 0) { - await testUtil.runShellCommand(true, 'docker-compose -f ' + path.join(__dirname, '../../docker-compose/docker-compose.yaml') + ' -p cucumber up -d'); - return await testUtil.sleep(testUtil.TIMEOUTS.SHORT_INC); + await testUtil.runShellCommand(true, 'docker-compose -f ' + path.join(__dirname, '../../../fixtures/docker-compose/docker-compose.yaml') + ' -p node up -d'); } else { - await testUtil.runShellCommand(true, 'docker-compose -f ' + path.join(__dirname, '../../docker-compose/docker-compose-tls.yaml') + ' -p cucumber up -d'); - return await testUtil.sleep(testUtil.TIMEOUTS.SHORT_INC); + await testUtil.runShellCommand(true, 'docker-compose -f ' + path.join(__dirname, '../../../fixtures/docker-compose/docker-compose-tls.yaml') + ' -p node up -d'); } + return await testUtil.sleep(testUtil.TIMEOUTS.SHORT_INC); }); this.Given(/^I have forcibly taken down all docker containers/, {timeout: testUtil.TIMEOUTS.LONG_STEP}, async () => { diff --git a/test/typescript/integration/network-e2e/invoke.ts b/test/typescript/integration/network-e2e/invoke.ts index 4483eef86c..40178de0ba 100644 --- a/test/typescript/integration/network-e2e/invoke.ts +++ b/test/typescript/integration/network-e2e/invoke.ts @@ -43,9 +43,9 @@ const channelName: string = testUtils.NETWORK_END2END.channel; const chaincodeId: string = testUtils.NETWORK_END2END.chaincodeId; const fixtures = process.cwd() + '/test/fixtures'; -const credPath = fixtures + '/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com'; +const credPath = fixtures + '/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp'; const certificatePem: string = fs.readFileSync(credPath + '/signcerts/User1@org1.example.com-cert.pem').toString(); -const privateKeyPem: string = fs.readFileSync(credPath + '/keystore/e4af7f90fa89b3e63116da5d278855cfb11e048397261844db89244549918731_sk').toString(); +const privateKeyPem: string = fs.readFileSync(credPath + '/keystore/key.pem').toString(); const inMemoryWallet: Wallet = new InMemoryWallet(); const ccp: Buffer = fs.readFileSync(fixtures + '/network.json'); const ccpDiscovery: Buffer = fs.readFileSync(fixtures + '/network-discovery.json'); diff --git a/test/typescript/integration/network-e2e/query.ts b/test/typescript/integration/network-e2e/query.ts index d536fb12f6..13cdeada15 100644 --- a/test/typescript/integration/network-e2e/query.ts +++ b/test/typescript/integration/network-e2e/query.ts @@ -39,9 +39,9 @@ const tlsLabel = 'tlsId'; async function createWallet(t: any, filePath: string): Promise { // define the identity to use - const credPath = fixtures + '/channel/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com'; + const credPath = fixtures + '/crypto-material/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp'; const cert = fs.readFileSync(credPath + '/signcerts/User1@org1.example.com-cert.pem').toString(); - const key = fs.readFileSync(credPath + '/keystore/e4af7f90fa89b3e63116da5d278855cfb11e048397261844db89244549918731_sk').toString(); + const key = fs.readFileSync(credPath + '/keystore/key.pem').toString(); const fileSystemWallet = new FileSystemWallet(filePath); diff --git a/test/typescript/test.ts b/test/typescript/test.ts index 9f53abe686..7551fc45ef 100644 --- a/test/typescript/test.ts +++ b/test/typescript/test.ts @@ -101,7 +101,7 @@ test('use the connection profile file', (t: any) => { client.initCredentialStores() .then(() => { t.pass('Successfully created the key value store and crypto store based on the sdk config and connection profile'); - const envelopeBytes = fs.readFileSync(path.join(__dirname, '../fixtures/channel/mychannelts.tx')); + const envelopeBytes = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/channel-config/mychannelts.tx')); config = client.extractChannelConfig(envelopeBytes); const signature: ConfigSignature = client.signChannelConfig(config); diff --git a/test/unit/msp.js b/test/unit/msp.js index e69d24bed3..d865635125 100644 --- a/test/unit/msp.js +++ b/test/unit/msp.js @@ -24,26 +24,7 @@ const Identity = idModule.Identity; const mspProto = ProtoLoader.load(path.join(__dirname, '../../fabric-client/lib/protos/msp/msp_config.proto')).msp; const FABRIC = 0; -const TEST_CERT_PEM = '-----BEGIN CERTIFICATE-----' + - 'MIIDVDCCAvqgAwIBAgIBATAKBggqhkjOPQQDAjBOMRMwEQYDVQQKDArOoyBBY21l' + - 'IENvMRkwFwYDVQQDExB0ZXN0LmV4YW1wbGUuY29tMQ8wDQYDVQQqEwZHb3BoZXIx' + - 'CzAJBgNVBAYTAk5MMB4XDTE2MTIxNjIzMTAxM1oXDTE2MTIxNzAxMTAxM1owTjET' + - 'MBEGA1UECgwKzqMgQWNtZSBDbzEZMBcGA1UEAxMQdGVzdC5leGFtcGxlLmNvbTEP' + - 'MA0GA1UEKhMGR29waGVyMQswCQYDVQQGEwJOTDBZMBMGByqGSM49AgEGCCqGSM49' + - 'AwEHA0IABFKnXh7hBdp6s9OJ/aadigT1z2WzBbSc7Hzb3rkaWFz4e+9alqqWg9lr' + - 'ur/mDYzG9dudC8jFjVa7KIh+2BxgBayjggHHMIIBwzAOBgNVHQ8BAf8EBAMCAgQw' + - 'JgYDVR0lBB8wHQYIKwYBBQUHAwIGCCsGAQUFBwMBBgIqAwYDgQsBMA8GA1UdEwEB' + - '/wQFMAMBAf8wDQYDVR0OBAYEBAECAwQwDwYDVR0jBAgwBoAEAQIDBDBiBggrBgEF' + - 'BQcBAQRWMFQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY0JDQ1NQLmV4YW1wbGUuY29t' + - 'MCoGCCsGAQUFBzAChh5odHRwOi8vY3J0LmV4YW1wbGUuY29tL2NhMS5jcnQwRgYD' + - 'VR0RBD8wPYIQdGVzdC5leGFtcGxlLmNvbYERZ29waGVyQGdvbGFuZy5vcmeHBH8A' + - 'AAGHECABSGAAACABAAAAAAAAAGgwDwYDVR0gBAgwBjAEBgIqAzAqBgNVHR4EIzAh' + - 'oB8wDoIMLmV4YW1wbGUuY29tMA2CC2V4YW1wbGUuY29tMFcGA1UdHwRQME4wJaAj' + - 'oCGGH2h0dHA6Ly9jcmwxLmV4YW1wbGUuY29tL2NhMS5jcmwwJaAjoCGGH2h0dHA6' + - 'Ly9jcmwyLmV4YW1wbGUuY29tL2NhMS5jcmwwFgYDKgMEBA9leHRyYSBleHRlbnNp' + - 'b24wCgYIKoZIzj0EAwIDSAAwRQIgcguBb6FUxO+X8DbY17gpqSGuNC4NT4BddPg1' + - 'UWUxIC0CIQDNyHQAwzhw+512meXRwG92GfpzSBssDKLdwlrqiHOu5A==' + - '-----END CERTIFICATE-----'; +const TEST_CERT_PEM = fs.readFileSync(path.resolve(__dirname, '../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem')); test('\n\n** MSP Tests **\n\n', async (t) => { testutil.resetDefaults(); @@ -91,12 +72,12 @@ test('\n\n** MSP Tests **\n\n', async (t) => { 'Check MSPManager.loadMSPs() arguments: each config must have getConfig() returning a valid FabricMSPConfig' ); - let config = loadMSPConfig('peerOrg0', 'org0'); + let config = loadMSPConfig('peer0.org1.example.com'); t.pass('Successfully loaded msp config for org0'); configs.push(config); - config = loadMSPConfig('peerOrg1', 'org1'); + config = loadMSPConfig('peer1.org1.example.com'); t.pass('Successfully loaded msp config for org1'); configs.push(config); @@ -122,7 +103,7 @@ test('\n\n** MSP Tests **\n\n', async (t) => { const mspImpl = new MSP({ rootCerts: [], admins: [], - id: 'peerOrg0', + id: 'peer0.org1.example.com', cryptoSuite: cryptoUtils }); @@ -131,23 +112,23 @@ test('\n\n** MSP Tests **\n\n', async (t) => { const serializedID = identity.serialize(); identity = await mspm.deserializeIdentity(serializedID); - t.equal(identity.getMSPId(), 'peerOrg0', 'Deserialized identity using MSP manager'); + t.equal(identity.getMSPId(), 'peer0.org1.example.com', 'Deserialized identity using MSP manager'); - t.equal(mspm.getMSP('peerOrg0').getId(), 'peerOrg0', 'Checking MSPManager getMSP() method'); + t.equal(mspm.getMSP('peer0.org1.example.com').getId(), 'peer0.org1.example.com', 'Checking MSPManager getMSP() method'); t.end(); }); -const loadMSPConfig = (name, org) => { +const loadMSPConfig = (peerorg) => { const mspConfig = new mspProto.MSPConfig(); mspConfig.setType(FABRIC); // type: FABRIC const fConfig = new mspProto.FabricMSPConfig(); - fConfig.setName(name); + fConfig.setName(peerorg); - let data = fs.readFileSync(path.resolve(__dirname, '../fixtures/msp', org, 'cacerts/org_ca.pem')); + let data = fs.readFileSync(path.resolve(__dirname, '../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers', peerorg, 'msp/cacerts/ca.org1.example.com-cert.pem')); fConfig.setRootCerts([data]); - data = fs.readFileSync(path.resolve(__dirname, '../fixtures/msp', org, 'admincerts/admin.pem')); + data = fs.readFileSync(path.resolve(__dirname, '../fixtures/crypto-material/crypto-config/peerOrganizations/org1.example.com/peers', peerorg, 'msp/admincerts/Admin@org1.example.com-cert.pem')); fConfig.setAdmins([data]); mspConfig.setConfig(fConfig.toBuffer()); return mspConfig; diff --git a/test/unit/network-config.js b/test/unit/network-config.js index e128a46581..37ca40d619 100644 --- a/test/unit/network-config.js +++ b/test/unit/network-config.js @@ -247,7 +247,7 @@ test('\n\n ** configuration testing **\n\n', (t) => { 'orderer0': { url: 'grpcs://localhost:7050', 'tlsCACerts': { - path: 'test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem' + path: 'test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem' } } }; @@ -345,23 +345,24 @@ test('\n\n ** configuration testing **\n\n', (t) => { 'peer2': { url: 'grpcs://localhost:7052', 'tlsCACerts': { - path: 'test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem' + path: 'test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem' } }, 'peer3': { url: 'grpcs://localhost:7053', 'tlsCACerts': { - path: 'test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem' + path: 'test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem' } }, 'peer4': { url: 'grpcs://localhost:7054', 'tlsCACerts': { - path: 'test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem' + path: 'test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem' } }, }; + network_config.certificateAuthorities = { 'ca1': { url: 'https://localhost:7051', @@ -374,7 +375,7 @@ test('\n\n ** configuration testing **\n\n', (t) => { 'ca2': { url: 'https://localhost:7052', 'tlsCACerts': { - path: 'test/fixtures/channel/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tlscacerts/example.com-cert.pem' + path: 'test/fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem' }, grpcOptions: {verify: true}, registrar: {enrollId: 'admin2', enrollSecret: 'adminpw2'} diff --git a/test/unit/read-configtx.js b/test/unit/read-configtx.js index 48e5cec20a..6976263553 100644 --- a/test/unit/read-configtx.js +++ b/test/unit/read-configtx.js @@ -30,7 +30,7 @@ test('\n\n***** READ in the genesis block *****\n\n', (t) => { testUtil.resetDefaults(); // readin the envelope to send to the orderer - const normalPath = path.normalize(path.join(__dirname, '../fixtures/channel/twoorgs.genesis.block')); + const normalPath = path.normalize(path.join(__dirname, '../fixtures/crypto-material/config-base/twoorgs.genesis.block')); const data = fs.readFileSync(normalPath); const channel = new Channel('test', 'fake'); diff --git a/test/unit/util.js b/test/unit/util.js index 4374fab0d2..493c88f6ae 100644 --- a/test/unit/util.js +++ b/test/unit/util.js @@ -181,9 +181,9 @@ module.exports.setAdmin = function(client, userOrg) { }; function getAdmin(client, t, userOrg) { - const keyPath = path.join(__dirname, util.format('../fixtures/channel/crypto-config/peerOrganizations/%s.example.com/users/Admin@%s.example.com/keystore', userOrg, userOrg)); + const keyPath = path.join(__dirname, util.format('../fixtures/crypto-material/crypto-config/peerOrganizations/%s.example.com/users/Admin@%s.example.com/msp/keystore', userOrg, userOrg)); const keyPEM = Buffer.from(readAllFiles(keyPath)[0]).toString(); - const certPath = path.join(__dirname, util.format('../fixtures/channel/crypto-config/peerOrganizations/%s.example.com/users/Admin@%s.example.com/signcerts', userOrg, userOrg)); + const certPath = path.join(__dirname, util.format('../fixtures/crypto-material/crypto-config/peerOrganizations/%s.example.com/users/Admin@%s.example.com/msp/signcerts', userOrg, userOrg)); const certPEM = readAllFiles(certPath)[0]; const cryptoSuite = Client.newCryptoSuite(); @@ -203,9 +203,9 @@ function getAdmin(client, t, userOrg) { } function getOrdererAdmin(client, t) { - const keyPath = path.join(__dirname, '../fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/keystore'); + const keyPath = path.join(__dirname, '../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore'); const keyPEM = Buffer.from(readAllFiles(keyPath)[0]).toString(); - const certPath = path.join(__dirname, '../fixtures/channel/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/signcerts'); + const certPath = path.join(__dirname, '../fixtures/crypto-material/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts'); const certPEM = readAllFiles(certPath)[0]; t.comment('getOrdererAdmin'); @@ -370,7 +370,7 @@ module.exports.setupChannel = async function(t, client_org1, client_org2, channe let channel_org2 = null; try { // get the config envelope created by the configtx tool - const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/channel/adminconfig.tx')); + const envelope_bytes = fs.readFileSync(path.join(__dirname, '../fixtures/crypto-material/channel-config/', channel_name + '.tx')); // Have the sdk get the config update object from the envelope. // the config update object is what is required to be signed by all // participating organizations