From 0fb6d7e4e2bfc7be2ee751ebf6e248c235fb665e Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Mon, 9 Jan 2023 09:11:43 +0000 Subject: [PATCH 1/8] Update to fixed level of dependency checker Signed-off-by: Matthew B White --- .github/workflows/build.yml | 20 +++++++++++++++++++- fabric-chaincode-shim/build.gradle | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6895c4be..71d9a2555 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,4 +20,22 @@ jobs: distribution: 'temurin' java-version: '11' cache: 'gradle' - - run: ./gradlew build --no-daemon + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b + - name: Dependency Check + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: | + :fabric-chaincode-shim:dependencyCheckAnalyze + - name: Build and Unit test + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: | + :fabric-chaincode-shim:build + -xdependencyCheckAnalyze + - name: Integration Tests + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: | + :fabric-chaincode-integration-test:build + -xdependencyCheckAnalyze diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle index 428106648..73e906c05 100644 --- a/fabric-chaincode-shim/build.gradle +++ b/fabric-chaincode-shim/build.gradle @@ -8,7 +8,7 @@ mavenCentral() } dependencies { - classpath 'org.owasp:dependency-check-gradle:7.1.0.1' + classpath 'org.owasp:dependency-check-gradle:7.4.4' } } From bf5ac7a71c9500ed194f8d50d87d48fefb69381c Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Tue, 10 Jan 2023 12:08:27 +0000 Subject: [PATCH 2/8] Massive update to intergation test Signed-off-by: Matthew B White --- .github/workflows/build.yml | 40 +- .gitignore | 6 +- build.gradle | 2 +- ci/azure-pipelines.yml | 2 +- fabric-chaincode-integration-test/.gitignore | 3 + .../build.gradle | 5 - .../chaincodebootstrap.gradle | 12 + .../getDockerImages.sh | 19 - .../src/contracts/bare-gradle/build.gradle | 3 + .../src/contracts/bare-maven/pom.xml | 6 +- .../contracts/fabric-ledger-api/build.gradle | 3 + .../contracts/fabric-shim-api/build.gradle | 3 + .../src/contracts/wrapper-maven/pom.xml | 4 + .../contractinstall/ContractInstallTest.java | 8 +- .../ledgertests/LedgerIntegrationTest.java | 5 +- .../shimtests/SACCIntegrationTest.java | 10 +- .../shimtests/SBECCIntegrationTest.java | 94 ++--- .../fabric/shim/integration/util/Bash.java | 79 ++++ .../fabric/shim/integration/util/Command.java | 18 +- .../shim/integration/util/FabricState.java | 53 +-- .../shim/integration/util/InvokeHelper.java | 11 +- .../fabric/shim/integration/util/Peer.java | 15 +- .../resources/chaincodeendorsementpolicy.yaml | 15 - .../chaincodeendorsementpolicy_2orgs.yaml | 21 - .../src/test/resources/collection_config.yaml | 20 - .../resources/docker-compose-microfab.yaml | 18 + .../src/test/resources/first-network/.env | 1 - .../base/docker-compose-base.yaml | 114 ------ .../first-network/base/peer-base.yaml | 28 -- .../channel-artifacts/genesis.block | Bin 12766 -> 0 bytes .../channel-artifacts/sachannel.tx | Bin 346 -> 0 bytes .../sachannelOrg1MSPanchors.tx | Bin 284 -> 0 bytes .../sachannelOrg2MSPanchors.tx | Bin 284 -> 0 bytes .../channel-artifacts/sbechannel.tx | Bin 348 -> 0 bytes .../sbechannelOrg1MSPanchors.tx | Bin 286 -> 0 bytes .../sbechannelOrg2MSPanchors.tx | Bin 286 -> 0 bytes .../resources/first-network/configtx.yaml | 321 --------------- .../first-network/crypto-config.yaml | 83 ---- .../example.com/ca/ca.example.com-cert.pem | 14 - ...e1371e71b898d2462a9ac0f928af8e13a060bb7_sk | 5 - .../msp/admincerts/Admin@example.com-cert.pem | 13 - .../msp/cacerts/ca.example.com-cert.pem | 14 - .../msp/tlscacerts/tlsca.example.com-cert.pem | 14 - .../msp/admincerts/Admin@example.com-cert.pem | 13 - .../msp/cacerts/ca.example.com-cert.pem | 14 - ...e3d5df1715a0b545c17308a1de0dd9d19a014da_sk | 5 - .../signcerts/orderer.example.com-cert.pem | 13 - .../msp/tlscacerts/tlsca.example.com-cert.pem | 14 - .../orderers/orderer.example.com/tls/ca.crt | 14 - .../orderer.example.com/tls/server.crt | 15 - .../orderer.example.com/tls/server.key | 5 - ...2a6bc714704defc46cd7cd2f014eca48fba85e9_sk | 5 - .../tlsca/tlsca.example.com-cert.pem | 14 - .../msp/admincerts/Admin@example.com-cert.pem | 13 - .../msp/cacerts/ca.example.com-cert.pem | 14 - ...381220cf4bb57f3d43349b91b46cbe02b010c17_sk | 5 - .../msp/signcerts/Admin@example.com-cert.pem | 13 - .../msp/tlscacerts/tlsca.example.com-cert.pem | 14 - .../users/Admin@example.com/tls/ca.crt | 14 - .../users/Admin@example.com/tls/client.crt | 14 - .../users/Admin@example.com/tls/client.key | 5 - ...3bf8c3bb620cc571007f5b68e1f6a0766258005_sk | 5 - .../ca/ca.org1.example.com-cert.pem | 15 - .../Admin@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - .../org1.example.com/msp/config.yaml | 8 - .../tlsca.org1.example.com-cert.pem | 15 - .../Admin@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - .../peer0.org1.example.com/msp/config.yaml | 8 - ...f8cef41f90e1f1836e8dc9b304bd0e0e15de4cd_sk | 5 - .../signcerts/peer0.org1.example.com-cert.pem | 14 - .../tlsca.org1.example.com-cert.pem | 15 - .../peers/peer0.org1.example.com/tls/ca.crt | 15 - .../peer0.org1.example.com/tls/server.crt | 15 - .../peer0.org1.example.com/tls/server.key | 5 - .../Admin@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - .../peer1.org1.example.com/msp/config.yaml | 8 - ...f9c790d8c00057e755969f9309c28cc0d629eda_sk | 5 - .../signcerts/peer1.org1.example.com-cert.pem | 14 - .../tlsca.org1.example.com-cert.pem | 15 - .../peers/peer1.org1.example.com/tls/ca.crt | 15 - .../peer1.org1.example.com/tls/server.crt | 15 - .../peer1.org1.example.com/tls/server.key | 5 - ...7677303cb6922a5ce722cd8f4ef6e92a346d59c_sk | 5 - .../tlsca/tlsca.org1.example.com-cert.pem | 15 - .../Admin@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - ...46f5799b379fcd582bdde8230641ff2eb2ae883_sk | 5 - .../signcerts/Admin@org1.example.com-cert.pem | 14 - .../tlsca.org1.example.com-cert.pem | 15 - .../users/Admin@org1.example.com/tls/ca.crt | 15 - .../Admin@org1.example.com/tls/client.crt | 14 - .../Admin@org1.example.com/tls/client.key | 5 - .../User1@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - ...136c411392fe5af949354b05a5bd8041ec1f8a5_sk | 5 - .../signcerts/User1@org1.example.com-cert.pem | 14 - .../tlsca.org1.example.com-cert.pem | 15 - .../users/User1@org1.example.com/tls/ca.crt | 15 - .../User1@org1.example.com/tls/client.crt | 14 - .../User1@org1.example.com/tls/client.key | 5 - .../ca/ca.org2.example.com-cert.pem | 15 - ...123e93873dddce1e548f386f96856e9ccf168c1_sk | 5 - .../Admin@org2.example.com-cert.pem | 14 - .../msp/cacerts/ca.org2.example.com-cert.pem | 15 - .../org2.example.com/msp/config.yaml | 8 - .../tlsca.org2.example.com-cert.pem | 15 - .../Admin@org2.example.com-cert.pem | 14 - .../msp/cacerts/ca.org2.example.com-cert.pem | 15 - .../peer0.org2.example.com/msp/config.yaml | 8 - ...249b99bb6d57333d4a46c27b0d2062f5e8167e6_sk | 5 - .../signcerts/peer0.org2.example.com-cert.pem | 14 - .../tlsca.org2.example.com-cert.pem | 15 - .../peers/peer0.org2.example.com/tls/ca.crt | 15 - .../peer0.org2.example.com/tls/server.crt | 15 - .../peer0.org2.example.com/tls/server.key | 5 - .../Admin@org2.example.com-cert.pem | 14 - .../msp/cacerts/ca.org2.example.com-cert.pem | 15 - .../peer1.org2.example.com/msp/config.yaml | 8 - ...46742f8831e3411f7130444515875bcdf6297e2_sk | 5 - .../signcerts/peer1.org2.example.com-cert.pem | 14 - .../tlsca.org2.example.com-cert.pem | 15 - .../peers/peer1.org2.example.com/tls/ca.crt | 15 - .../peer1.org2.example.com/tls/server.crt | 15 - .../peer1.org2.example.com/tls/server.key | 5 - ...3561b3be6922e4a42cf29fdad22788b747985d7_sk | 5 - .../tlsca/tlsca.org2.example.com-cert.pem | 15 - .../Admin@org2.example.com-cert.pem | 14 - .../msp/cacerts/ca.org2.example.com-cert.pem | 15 - ...4811b2c7764059e95831bb0ed160f79f3a3794e_sk | 5 - .../signcerts/Admin@org2.example.com-cert.pem | 14 - .../tlsca.org2.example.com-cert.pem | 15 - .../users/Admin@org2.example.com/tls/ca.crt | 15 - .../Admin@org2.example.com/tls/client.crt | 14 - .../Admin@org2.example.com/tls/client.key | 5 - .../User1@org2.example.com-cert.pem | 14 - .../msp/cacerts/ca.org2.example.com-cert.pem | 15 - ...6296d497f9a450341b3d39a42d1d86ba3e285c4_sk | 5 - .../signcerts/User1@org2.example.com-cert.pem | 14 - .../tlsca.org2.example.com-cert.pem | 15 - .../users/User1@org2.example.com/tls/ca.crt | 15 - .../User1@org2.example.com/tls/client.crt | 14 - .../User1@org2.example.com/tls/client.key | 5 - .../first-network/docker-compose-cli.yaml | 92 ----- .../first-network/scripts/capabilities.json | 9 - .../scripts/collection_config.json | 9 - .../resources/first-network/scripts/script.sh | 99 ----- .../resources/first-network/scripts/utils.sh | 366 ------------------ .../src/test/resources/scripts/ccutils.sh | 273 +++++++++++++ .../resources/scripts/collection_config.json | 9 + .../src/test/resources/scripts/mfsetup.sh | 97 +++++ 153 files changed, 662 insertions(+), 2574 deletions(-) create mode 100644 fabric-chaincode-integration-test/.gitignore create mode 100644 fabric-chaincode-integration-test/chaincodebootstrap.gradle delete mode 100755 fabric-chaincode-integration-test/getDockerImages.sh create mode 100644 fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java delete mode 100644 fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy_2orgs.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/collection_config.yaml create mode 100644 fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/.env delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/base/docker-compose-base.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/genesis.block delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannel.tx delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg1MSPanchors.tx delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg2MSPanchors.tx delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannel.tx delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannelOrg1MSPanchors.tx delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannelOrg2MSPanchors.tx delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/configtx.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/dc0e794b1091c43ef16457414e1371e71b898d2462a9ac0f928af8e13a060bb7_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/9532dfa1f6fd6f195b538dad5e3d5df1715a0b545c17308a1de0dd9d19a014da_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/f385781620bf864bdfaf3744c2a6bc714704defc46cd7cd2f014eca48fba85e9_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/b0b3c309a7d201898f6572bd1381220cf4bb57f3d43349b91b46cbe02b010c17_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/4d1dfcb3e47e5a89357d7cda73bf8c3bb620cc571007f5b68e1f6a0766258005_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/87169e9fbaf4a3e33b2d169bdf8cef41f90e1f1836e8dc9b304bd0e0e15de4cd_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/config.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/540b89c87b4e781e9e43230c0f9c790d8c00057e755969f9309c28cc0d629eda_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/4fc0ed49a8f31cf626cb9199b7677303cb6922a5ce722cd8f4ef6e92a346d59c_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/23acbdca52b60346fb189be8846f5799b379fcd582bdde8230641ff2eb2ae883_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/06598da2a5c8268d5e09ff090136c411392fe5af949354b05a5bd8041ec1f8a5_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/f5e00e1f9abb3291ea35970c6123e93873dddce1e548f386f96856e9ccf168c1_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/config.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/config.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/983726350b06050b9073348da249b99bb6d57333d4a46c27b0d2062f5e8167e6_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/config.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/6259fa0caff41fc0fd8a2b16e46742f8831e3411f7130444515875bcdf6297e2_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/9eb5d2f5eaf8a4b33883b34393561b3be6922e4a42cf29fdad22788b747985d7_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/73b84d0e0bb0c31d6eb40d6054811b2c7764059e95831bb0ed160f79f3a3794e_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/f0cbbe6fb24330132e15fd0f56296d497f9a450341b3d39a42d1d86ba3e285c4_sk delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/docker-compose-cli.yaml delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/scripts/capabilities.json delete mode 100644 fabric-chaincode-integration-test/src/test/resources/first-network/scripts/collection_config.json delete mode 100755 fabric-chaincode-integration-test/src/test/resources/first-network/scripts/script.sh delete mode 100755 fabric-chaincode-integration-test/src/test/resources/first-network/scripts/utils.sh create mode 100644 fabric-chaincode-integration-test/src/test/resources/scripts/ccutils.sh create mode 100644 fabric-chaincode-integration-test/src/test/resources/scripts/collection_config.json create mode 100755 fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71d9a2555..cea9963f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,9 +33,43 @@ jobs: arguments: | :fabric-chaincode-shim:build -xdependencyCheckAnalyze - - name: Integration Tests - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: + + intergationtest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + + - name: Populate chaincode with latest java-version + run: | + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository + + + - name: Ensure that the Peer/weft tools are available + run: | + curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary + npm install -g @hyperledger-labs/weft + + # set the path and cfg env var for the rest of the step + echo "FABRIC_CFG_PATH=$GITHUB_WORKSPACE/config" >> $GITHUB_ENV + echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH + - name: versions + run: | + peer version + weft --version + - name: Integration Tests + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: arguments: | :fabric-chaincode-integration-test:build -xdependencyCheckAnalyze + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7b10e4e67..45a0dba7b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,11 @@ /build/ build/* -.env +_cfg +repository +.env +config .gradle /build/ out/ @@ -44,3 +47,4 @@ gradle.properties ### Jekyll ### .sass-cache _site + diff --git a/build.gradle b/build.gradle index 158dcb0d6..63eeab8fb 100644 --- a/build.gradle +++ b/build.gradle @@ -71,4 +71,4 @@ def getDate() { def date = new Date() def formattedDate = date.format('yyyyMMdd') return formattedDate -} +} \ No newline at end of file diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index bc39e0894..8825bbf90 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -64,7 +64,7 @@ stages: javaHomeOption: "JDKVersion" jdkVersionOption: "1.8" jdkArchitectureOption: "x64" - options: "-x javadoc" + options: "-x javadoc -x :fabric-chaincode-integration-test:test" publishJUnitResults: true testResultsFiles: "$(System.DefaultWorkingDirectory)/**/TEST-*.xml" tasks: "build" diff --git a/fabric-chaincode-integration-test/.gitignore b/fabric-chaincode-integration-test/.gitignore new file mode 100644 index 000000000..04cc8e939 --- /dev/null +++ b/fabric-chaincode-integration-test/.gitignore @@ -0,0 +1,3 @@ +repository +_cfg +*.tar.gz diff --git a/fabric-chaincode-integration-test/build.gradle b/fabric-chaincode-integration-test/build.gradle index 3e4e0313d..9e6ba9111 100644 --- a/fabric-chaincode-integration-test/build.gradle +++ b/fabric-chaincode-integration-test/build.gradle @@ -29,8 +29,3 @@ task getLatestDockerImages{ } } } - -build.dependsOn project(':fabric-chaincode-docker').buildImage - -test.dependsOn project.getLatestDockerImages - diff --git a/fabric-chaincode-integration-test/chaincodebootstrap.gradle b/fabric-chaincode-integration-test/chaincodebootstrap.gradle new file mode 100644 index 000000000..67b9b238c --- /dev/null +++ b/fabric-chaincode-integration-test/chaincodebootstrap.gradle @@ -0,0 +1,12 @@ +allprojects { + apply plugin: 'maven-publish' + + publishing { + repositories { + maven { + name = 'fabric' + url = "file:$chaincodeRepoDir" + } + } + } +} \ No newline at end of file diff --git a/fabric-chaincode-integration-test/getDockerImages.sh b/fabric-chaincode-integration-test/getDockerImages.sh deleted file mode 100755 index c87011419..000000000 --- a/fabric-chaincode-integration-test/getDockerImages.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# -set -euo pipefail - -version=${FABRIC_VERSION:-latest} -artifactory_url=hyperledger-fabric.jfrog.io - -for image in peer orderer ca tools; do - artifactory_image="${artifactory_url}/fabric-${image}:amd64-${version}" - docker pull -q "${artifactory_image}" - docker tag "${artifactory_image}" "hyperledger/fabric-${image}" - docker rmi -f "${artifactory_image}" >/dev/null -done - -docker pull -q hyperledger/fabric-couchdb diff --git a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle index ce979a597..097c68b35 100644 --- a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle @@ -12,6 +12,9 @@ repositories { mavenLocal() mavenCentral() maven { url = "https://www.jitpack.io" } + maven { + url "$projectDir/repository" + } } dependencies { diff --git a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml index e7016bc2b..5cd5d4475 100644 --- a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml +++ b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml @@ -32,7 +32,11 @@ artifactory https://hyperledger.jfrog.io/hyperledger/fabric-maven - + + + localfabirc + file://${project.basedir}/repository + diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle index de1358693..14ebfcc85 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle @@ -12,6 +12,9 @@ repositories { mavenLocal() mavenCentral() maven { url = "https://www.jitpack.io" } + maven { + url "$projectDir/repository" + } } dependencies { diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle index ce979a597..097c68b35 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle @@ -12,6 +12,9 @@ repositories { mavenLocal() mavenCentral() maven { url = "https://www.jitpack.io" } + maven { + url "$projectDir/repository" + } } dependencies { diff --git a/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml index e7016bc2b..b3f68f869 100644 --- a/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml +++ b/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml @@ -33,6 +33,10 @@ artifactory https://hyperledger.jfrog.io/hyperledger/fabric-maven + + localfabric + file://${project.basedir}/repository + diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java index a1fe66e83..3c9cd58b1 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java @@ -21,22 +21,22 @@ public class ContractInstallTest { @BeforeClass public static void setUp() throws Exception { FabricState.getState().start(); - FabricState.getState().startChannel("sachannel"); + } @Test public void TestInstall(){ InvokeHelper helper = InvokeHelper.newHelper("baregradlecc","sachannel"); - String text = helper.invoke(new String[]{"whoami"}); + String text = helper.invoke("org1",new String[]{"whoami"}); assertThat(text, containsString("BareGradle")); helper = InvokeHelper.newHelper("baremaven","sachannel"); - text = helper.invoke(new String[]{"whoami"}); + text = helper.invoke("org1",new String[]{"whoami"}); assertThat(text, containsString("BareMaven")); helper = InvokeHelper.newHelper("wrappermaven","sachannel"); - text = helper.invoke(new String[]{"whoami"}); + text = helper.invoke("org1",new String[]{"whoami"}); assertThat(text, containsString("WrapperMaven")); } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java index a66c3ff9f..c20bd27a4 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java @@ -20,15 +20,16 @@ public class LedgerIntegrationTest { @BeforeClass public static void setUp() throws Exception { + + FabricState.getState().start(); - FabricState.getState().startChannel("sachannel"); } @Test public void TestLedgers(){ InvokeHelper helper = InvokeHelper.newHelper("ledgercc","sachannel"); - String text = helper.invoke(new String[]{"accessLedgers"}); + String text = helper.invoke("org1",new String[]{"accessLedgers"}); assertThat(text, containsString("success")); } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java index 085b69364..a7e2ca31b 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java @@ -21,24 +21,24 @@ public class SACCIntegrationTest { @BeforeClass public static void setUp() throws Exception { FabricState.getState().start(); - FabricState.getState().startChannel("sachannel"); + } @Test public void TestLedger(){ InvokeHelper helper = InvokeHelper.newHelper("shimcc", "sachannel"); - String text = helper.invoke(new String[]{"putBulkStates"}); + String text = helper.invoke("org1",new String[]{"putBulkStates"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[]{"getByRange","key120","key170"}); + text = helper.invoke("org1",new String[]{"getByRange","key120","key170"}); assertThat(text, containsString("50")); - text = helper.invoke(new String[]{"getByRangePaged","key120","key170","10",""}); + text = helper.invoke("org1",new String[]{"getByRangePaged","key120","key170","10",""}); System.out.println(text); assertThat(text, containsString("key130")); - text = helper.invoke(new String[]{"getMetricsProviderName"}); + text = helper.invoke("org1",new String[]{"getMetricsProviderName"}); System.out.println(text); assertThat(text, containsString("org.hyperledger.fabric.metrics.impl.DefaultProvider")); } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java index abdd2e980..f125d7db2 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java @@ -26,7 +26,7 @@ public class SBECCIntegrationTest { @BeforeClass public static void setUp() throws Exception { FabricState.getState().start(); - FabricState.getState().startChannel("sachannel"); + } @@ -39,59 +39,59 @@ public void RunSBE_pub_setget() throws NoSuchAlgorithmException, InvalidKeySpecE String text; - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "foo"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "foo"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("foo")); - text = helper.invoke(new String[] {"EndorsementCC:addorgs", mode, "Org1MSP"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org1MSP"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:listorgs", mode}); - assertThat(text, containsString("Org1MSP")); + text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode}); + assertThat(text, containsString("org1MSP")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val1"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val1"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val1")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val2"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val2"}); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val2")); - text = helper.invoke(new String[] {"EndorsementCC:addorgs", mode, "Org2MSP"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org2MSP"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:listorgs", mode}); - assertThat(text, containsString("Org2MSP")); - assertThat(text, containsString("Org1MSP")); + text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode}); + assertThat(text, containsString("org2MSP")); + assertThat(text, containsString("org1MSP")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val3"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val3"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val3")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val4"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val4"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val4")); - text = helper.invoke(new String[] {"EndorsementCC:delorgs", mode, "Org1MSP"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:delorgs", mode, "org1MSP"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:listorgs", mode}); - assertThat(text, containsString("Org2MSP")); - assertThat(text, not(containsString("Org1MSP"))); + text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode}); + assertThat(text, containsString("org2MSP")); + assertThat(text, not(containsString("org1MSP"))); - text = helper.invoke(new String[] {"EndorsementCC:deleteval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:deleteval", mode}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:recordExists", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:recordExists", mode}); assertThat(text, containsString("false")); } @@ -105,60 +105,60 @@ public void RunSBE_priv() throws NoSuchAlgorithmException, InvalidKeySpecExcepti String text; - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "foo"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "foo"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("foo")); - text = helper.invoke(new String[] {"EndorsementCC:addorgs", mode, "Org1MSP"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org1MSP"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:listorgs", mode}); - assertThat(text, containsString("Org1MSP")); + text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode}); + assertThat(text, containsString("org1MSP")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val1"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val1"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val1")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val2"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val2"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val2")); - text = helper.invoke(new String[] {"EndorsementCC:addorgs", mode, "Org2MSP"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org2MSP"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:listorgs", mode}); - assertThat(text, containsString("Org2MSP")); - assertThat(text, containsString("Org1MSP")); + text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode}); + assertThat(text, containsString("org2MSP")); + assertThat(text, containsString("org1MSP")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val3"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val3"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val3")); - text = helper.invoke(new String[] {"EndorsementCC:setval", mode, "val4"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val4"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:getval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode}); assertThat(text, containsString("val4")); - text = helper.invoke(new String[] {"EndorsementCC:delorgs", mode, "Org1MSP"}); + text = helper.invoke("org1",new String[] {"EndorsementCC:delorgs", mode, "org1MSP"}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:listorgs", mode}); - assertThat(text, containsString("Org2MSP")); - assertThat(text, not(containsString("Org1MSP"))); + text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode}); + assertThat(text, containsString("org2MSP")); + assertThat(text, not(containsString("org1MSP"))); - text = helper.invoke(new String[] {"EndorsementCC:deleteval", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:deleteval", mode}); assertThat(text, containsString("success")); - text = helper.invoke(new String[] {"EndorsementCC:recordExists", mode}); + text = helper.invoke("org1",new String[] {"EndorsementCC:recordExists", mode}); assertThat(text, containsString("false")); } diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java new file mode 100644 index 000000000..1ebc87347 --- /dev/null +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java @@ -0,0 +1,79 @@ +/* +Copyright IBM Corp. All Rights Reserved. + +SPDX-License-Identifier: Apache-2.0 +*/ +package org.hyperleder.fabric.shim.integration.util; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** Represents the 'peer' cli command + * + * + * + */ +public class Bash extends Command { + + public static BashBuilder newBuilder(){ + return new BashBuilder(); + } + + static public class BashBuilder extends Command.Builder { + String cmd; + String orderer; + String channel; + String ccname; + boolean evaluate = false; + int waitForEventTimeout; + List args = new ArrayList(); + Map transientData; + + public BashBuilder duplicate() { + try { + return (BashBuilder) this.clone(); + } catch (CloneNotSupportedException e) { + + e.printStackTrace(); + return null; + } + } + + public BashBuilder cmd(String cmd){ + this.cmd = cmd; + return this; + } + + public BashBuilder cmdargs(String argsArray[]){ + this.args = Arrays.asList(argsArray); + return this; + } + + public Bash build(Map additionalEnv){ + + ArrayList list = new ArrayList<>(); + list.add(cmd); + + return new Bash(list,additionalEnv); + } + + + public Bash build(){ + + ArrayList list = new ArrayList<>(); + list.add(cmd); + list.addAll(args); + + return new Bash(list); + } + } + + Bash(List cmd) { + super(cmd); + } + + Bash(List cmd, Map env) { + super(cmd, env); + } +} \ No newline at end of file diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java index 21341d138..d6a7d1f5d 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java @@ -7,10 +7,12 @@ package org.hyperleder.fabric.shim.integration.util; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; +import java.lang.ProcessBuilder.Redirect; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -23,10 +25,17 @@ public class Command { protected List cmd; protected Map env; - Command(List cmd) { + Command(List cmd, Map additionalEnv){ this.cmd = cmd; - this.env = new HashMap<>(); + // this.env = new HashMap(System.getenv()); + this.env = new HashMap(); + this.env.putAll(additionalEnv); + } + Command(List cmd) { + this.cmd = cmd; + this.env = new HashMap(); + // this.env = new HashMap(System.getenv()); } public class Result { @@ -55,7 +64,12 @@ public Result run(boolean quiet) { System.out.println("Running:" + this.toString()); try { + + processBuilder.redirectInput(Redirect.INHERIT); + processBuilder.redirectErrorStream(true); + Process process = processBuilder.start(); + System.out.println("Started..... "); CompletableFuture> soutFut = readOutStream(process.getInputStream(),quiet?null:System.out); CompletableFuture> serrFut = readOutStream(process.getErrorStream(),quiet?null:System.err); diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java index f4c18ccaf..0954ca470 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/FabricState.java @@ -5,12 +5,15 @@ */ package org.hyperleder.fabric.shim.integration.util; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Semaphore; import org.hyperleder.fabric.shim.integration.util.Docker.DockerBuilder; import org.hyperleder.fabric.shim.integration.util.DockerCompose.DockerComposeBuilder; +import org.hyperleder.fabric.shim.integration.util.Bash.BashBuilder; public class FabricState { @@ -32,45 +35,31 @@ public static FabricState getState() { private boolean started = false; public synchronized void start() { - if (!this.started) { - - // create the docker-compose command - DockerComposeBuilder composebuilder = DockerCompose.newBuilder() - .file("src/test/resources/first-network/docker-compose-cli.yaml"); - - // close down anything running... - composebuilder.duplicate().down().build().run(); - - // ...and bring up - DockerCompose compose = composebuilder.up().detach().build(); - compose.run(); + if (!this.started) { + BashBuilder bashBuilder = new Bash.BashBuilder().cmd("src/test/resources/scripts/mfsetup.sh"); + bashBuilder.build().run(); this.started = true; } else { System.out.println("Fabric already started...."); } } - public void startChannel(String channelName) { - try { - flag.acquire(); - if (channelStarted.getOrDefault(channelName, false)) { - return; - } - - // the cli container contains a script that does the channel create, joing - // and chaincode install/instantiate - DockerBuilder dockerBuilder = new Docker.DockerBuilder(); - Docker docker = dockerBuilder.exec().container("cli").script("./scripts/script.sh").channel(channelName) - .build(); - docker.run(); - channelStarted.put(channelName, true); - - } catch (InterruptedException e) { - throw new RuntimeException(e); - } finally { - flag.release(); - } + public Map orgEnv(String org) { + Path currentRelativePath = Paths.get(""); + String s = currentRelativePath.toAbsolutePath().toString(); + + Map env = new HashMap(); + + env.put("CORE_PEER_MSPCONFIGPATH", + Paths.get(s, "src/test/resources/_cfg/_msp/" + org, org + "admin/msp").toString()); + env.put("CORE_PEER_LOCALMSPID", org + "MSP"); + env.put("CORE_PEER_ADDRESS", org + "peer-api.127-0-0-1.nip.io:8080"); + + + System.out.println(env); + return env; + } } \ No newline at end of file diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java index 71aee13fd..b8ee128eb 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/InvokeHelper.java @@ -1,5 +1,6 @@ package org.hyperleder.fabric.shim.integration.util; +import java.util.Map; import java.util.stream.Collectors; import org.hyperleder.fabric.shim.integration.util.Command.Result; @@ -20,11 +21,13 @@ public static InvokeHelper newHelper(String ccname, String channel) { return ih; } - public String invoke(String... args){ + public String invoke(String org, String... args){ + Map orgEnv = FabricState.getState().orgEnv(org); PeerBuilder coreBuilder = Peer.newBuilder().ccname(ccname).channel(channel); - Result r = coreBuilder.argsTx(args).build().run(); - System.out.println(r.stderr); - String text = r.stderr.stream() + + Result r = coreBuilder.argsTx(args).build(orgEnv).run(); + System.out.println(r.stdout); + String text = r.stdout.stream() .filter(line -> line.matches(".*chaincodeInvokeOrQuery.*")) .collect(Collectors.joining(System.lineSeparator())) .trim(); diff --git a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java index aa19815ea..59290fbb0 100644 --- a/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java +++ b/fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Peer.java @@ -110,12 +110,9 @@ private String argsToString() { return json.toString(); } - public Peer build(){ + public Peer build(Map additionalEnv){ ArrayList list = new ArrayList<>(); - list.add("docker"); - list.add("exec"); - list.add("cli"); list.add("peer"); list.add("chaincode"); list.add(evaluate?"query":"invoke"); @@ -154,16 +151,16 @@ public Peer build(){ } list.add("--peerAddresses"); - list.add("peer0.org1.example.com:7051"); + list.add("org1peer-api.127-0-0-1.nip.io:8080"); list.add("--peerAddresses"); - list.add("peer0.org2.example.com:7051"); + list.add("org2peer-api.127-0-0-1.nip.io:8080"); - return new Peer(list); + return new Peer(list,additionalEnv); } } - Peer(List cmd) { - super(cmd); + Peer(List cmd, Map additionalEnv) { + super(cmd,additionalEnv); } } \ No newline at end of file diff --git a/fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy.yaml b/fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy.yaml deleted file mode 100644 index bb77ecf5e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# ---- -# A Shotgun policy xx -identities: # list roles to be used in the policy - user1: {"role": {"name": "member", "mspId": "Org1MSP"}} # role member in org with mspid Org1MSP - admin1: {"role": {"name": "admin", "mspId": "Org1MSP"}} # admin role. - -policy: # the policy .. could have been flat but show grouping. - 1-of: # signed by one of these groups can be -of where is any digit 2-of, 3-of etc.. - - signed-by: "user1" # a reference to one of the identities defined above. - - signed-by: "admin1" diff --git a/fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy_2orgs.yaml b/fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy_2orgs.yaml deleted file mode 100644 index fc06fdba6..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/chaincodeendorsementpolicy_2orgs.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# ---- -# A Shotgun policy xx -identities: # list roles to be used in the policy - user1: {"role": {"name": "member", "mspId": "Org1MSP"}} # role member in org with mspid Org1MSP - user2: {"role": {"name": "member", "mspId": "Org2MSP"}} - admin1: {"role": {"name": "admin", "mspId": "Org1MSP"}} # admin role. - admin2: {"role": {"name": "admin", "mspId": "Org2MSP"}} - -policy: # the policy .. could have been flat but show grouping. - 1-of: # signed by one of these groups can be -of where is any digit 2-of, 3-of etc.. - - 1-of: - - signed-by: "user1" # a reference to one of the identities defined above. - - signed-by: "admin1" - - 1-of: - - signed-by: "user2" - - signed-by: "admin2" diff --git a/fabric-chaincode-integration-test/src/test/resources/collection_config.yaml b/fabric-chaincode-integration-test/src/test/resources/collection_config.yaml deleted file mode 100644 index bfa48b090..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/collection_config.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- StaticCollectionConfig: # protobuf oneof identifies type. - name: col - blockToLive: 100000 - maximumPeerCount: 2 - requiredPeerCount: 2 - SignaturePolicyEnvelope: # protobuf oneOf identifies type - identities: # list roles to be used in the policy - - user1: {"role": {"name": "member", "mspId": "Org1MSP"}} # role member in org with mspid Org1MSP - - user2: {"role": {"name": "member", "mspId": "Org2MSP"}} - - admin1: {"role": {"name": "admin", "mspId": "Org1MSP"}} # admin role. - - admin2: {"role": {"name": "admin", "mspId": "Org2MSP"}} - - policy: # the policy .. could have been flat but show grouping. - 1-of: # signed by one of these groups can be -of where is any digit 2-of, 3-of etc.. - - 1-of: - - signed-by: "user1" # a reference to one of the identities defined above. - - signed-by: "admin1" - - 1-of: - - signed-by: "user2" - - signed-by: "admin2" diff --git a/fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml b/fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml new file mode 100644 index 000000000..1139861b6 --- /dev/null +++ b/fabric-chaincode-integration-test/src/test/resources/docker-compose-microfab.yaml @@ -0,0 +1,18 @@ +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +version: '2' + +services: + + microfab: + container_name: microfab + image: ibmcom/ibp-microfab + tty: true + environment: + - MICROFAB_CONFIG={"couchdb":false,"endorsing_organizations":[{"name":"org1"},{"name":"org2"}],"channels":[{"name":"sachannel","endorsing_organizations":["org1","org2"]}],"capability_level":"V2_0"} + - FABRIC_LOGGING_SPEC=info + ports: + - 8080:8080 diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/.env b/fabric-chaincode-integration-test/src/test/resources/first-network/.env deleted file mode 100644 index 4fd2ee0d7..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/.env +++ /dev/null @@ -1 +0,0 @@ -COMPOSE_PROJECT_NAME=net diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/base/docker-compose-base.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/base/docker-compose-base.yaml deleted file mode 100644 index d9c449d50..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/base/docker-compose-base.yaml +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -version: '2' - -services: - - orderer.example.com: - container_name: orderer.example.com - image: hyperledger/fabric-orderer - environment: - - ORDERER_GENERAL_LOGLEVEL=INFO - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block - - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - # enabled TLS - - ORDERER_GENERAL_TLS_ENABLED=false - - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] - working_dir: /opt/gopath/src/github.com/hyperledger/fabric - command: orderer - volumes: - - ../channel-artifacts/genesis.block:/var/hyperledger/orderer/orderer.genesis.block - - ../crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp - - ../crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls - # - orderer.example.com:/var/hyperledger/production/orderer - ports: - - 7050:7050 - - peer0.org1.example.com: - container_name: peer0.org1.example.com - extends: - file: peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer0.org1.example.com - - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org1.example.com:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - volumes: - - /var/run/:/host/var/run/ - - ../crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp - - ../crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls - # - peer0.org1.example.com:/var/hyperledger/production - ports: - - 7051:7051 - - 7053:7053 - - peer1.org1.example.com: - container_name: peer1.org1.example.com - extends: - file: peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer1.org1.example.com - - CORE_PEER_ADDRESS=peer1.org1.example.com:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org1.example.com:7051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - volumes: - - /var/run/:/host/var/run/ - - ../crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp:/etc/hyperledger/fabric/msp - - ../crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls:/etc/hyperledger/fabric/tls - # - peer1.org1.example.com:/var/hyperledger/production - - ports: - - 8051:7051 - - 8053:7053 - - peer0.org2.example.com: - container_name: peer0.org2.example.com - extends: - file: peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer0.org2.example.com - - CORE_PEER_ADDRESS=peer0.org2.example.com:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:7051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org2.example.com:7051 - - CORE_PEER_LOCALMSPID=Org2MSP - volumes: - - /var/run/:/host/var/run/ - - ../crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp:/etc/hyperledger/fabric/msp - - ../crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls:/etc/hyperledger/fabric/tls - # - peer0.org2.example.com:/var/hyperledger/production - ports: - - 9051:7051 - - 9053:7053 - - peer1.org2.example.com: - container_name: peer1.org2.example.com - extends: - file: peer-base.yaml - service: peer-base - environment: - - CORE_PEER_ID=peer1.org2.example.com - - CORE_PEER_ADDRESS=peer1.org2.example.com:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org2.example.com:7051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:7051 - - CORE_PEER_LOCALMSPID=Org2MSP - volumes: - - /var/run/:/host/var/run/ - - ../crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp:/etc/hyperledger/fabric/msp - - ../crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls:/etc/hyperledger/fabric/tls - # - peer1.org2.example.com:/var/hyperledger/production - ports: - - 10051:7051 - - 10053:7053 diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml deleted file mode 100644 index a7711b52d..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -version: '2' - -services: - peer-base: - image: hyperledger/fabric-peer - environment: - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - # 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=${COMPOSE_PROJECT_NAME}_byfn - - FABRIC_LOGGING_SPEC=INFO - - CORE_PEER_TLS_ENABLED=false - - CORE_PEER_GOSSIP_USELEADERELECTION=true - - CORE_PEER_GOSSIP_ORGLEADER=false - - CORE_PEER_PROFILE_ENABLED=true - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt - - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv - - CORE_CHAINCODE_EXECUTETIMEOUT=400s - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer - command: peer node start diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/genesis.block b/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/genesis.block deleted file mode 100644 index 71eb548744788212eccfeb34df02497b33c2af36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12766 zcmeHO+mGW|Uf!8$dTP(i^tL>+n%NQz(>(~-4zqC*=eE*{J-%OJJ9Zo=4rsx49LKjf ziIX_71R8`8Pb)1*NFV`X#lo%{4bl$q00My!Ji*g~K+6jfulxrHu{cR3RozwH)!j2Y z^U_sPRr#Esk1sjj`F-Daeg*EHzVmDU^TmG%|LFb;zwx#I{=RDdQvCIA{K@RQ_dopk z?@b!_-v0Gl|BQTKgZno4whew6{Nl+Aw_iBDdGfs<{P} z@_gvbojLMnZzBKo1^{P=^4vxK<&D$tybfLxJ8k3-UPpfGb>uf+KlX1MKfL+g_6w&N zPI`x+RE?uK0&3K*6^I;1w0weq!=4LM4u>wMNR(D&3L}AGr$z(0i3 zFSiwigg!nMl_Uj(VvxF`FjUIx-Hg)2{6etQr3hRUlro)|y}`o@fu|BC$n5a=}NrP1}b5SXb^EPhRCi=&=)YPb!2!q|l06rE8T^H9> z2G#u)T#X2%vBiXuRpFOrk6P0{?C$$)jnwl#4`=L%&MzEhz$iD?GzmNVfLJ5S`&&ES znQEu>{ymXYTJ?=iHFOwyVKeKn6-g^#Y4||IMF!u@n2v}wp-V9YarSpgu@L28{@lIM zqEzuBO=sfyDxQ~kg?`QZBh!ESpj3Jp)crjI|?Od4pu)TdGwv&IHBxG<`-TnG>`1)(5Q zHQZfRL>M#R@VxnR5)ieaNGSw|SNteg#k$HFbIOyUTW%!NeuK%vB#a1sp!TQ!O(wp?fwjZK?WIEG*O3fLillE}-bxce*D zf`-U)&{)g?G%DmZuAH^9B~h=5m84Qs&|z7PQ^GYkAs%p@M? z)O*&M2M$xu(x5}9=vpSJwWxJdSrajd9GH3AX5Ypg+eF$}6B*>Ua{}Pd&|s)*qAI4; zer|JAIwg(XdOC=j8!HOOqH3fx+^r8Rm6kN4hq>y6A6t<$1$J3liTMj+_5mb`)A)cX zO|1Zb0346P2G{}R01kQ<_Zh`>7JQ{Ob{HI&GmIJdJ+ZPjMZDgzIAz$9oMNS2k{zj) zcnS(ST|HXEq&}K7JGFqVFA7U{rgRqmI;N@|oT}BDuW5L`P+Yyl6eJ8-BXp3i*> z`Y@lk$qpD?ssth-!0Rvo9tOdK7;tk8bO}x&D1-H|?y_rC0zQ*@p)qEvSbrwBfQHu8 zVgn91V%jYmm_C4;+Uofc>=KV8MJma>TW)PW0x+RIwUA@)YWE7{G6V z8yyywk(=9})f)d-*J45LP; z1PO(18n~=zyfPLiNqd0wJjo&a$qp24p|bEXT(-T5T4% zZ6>J6slFm;wa(M=01c_pU;-M;%`T%{0h%XDC?L;1yNq%vp|oY%!3}qX4O*32qoRsJ zv|?!%m+B2QDK*d)?AC=&8!Y4gbemBg1k+hUfpd2mDDq^I_9|0U=Z93W>P^{BN;
`{~_sJ;su`a*wvLOHz& zhmki)?pDCds$=F{EUQy@-rQR}-ANcYyC!lE zc_+WXk6yUYZRFO)3vEg6{{HTr{XV@5K8u?Rd))Cd2l+hm$_cpr{`-Gddh7l7-#Nsd zz71a8#b{pS#LES83%LPaEGNhQ9|x}!d#0>9$ztx=3oo7|$jLF_C%~(OIW;XW^cJ3z zAa5W5oPZm8=@&}KXO2;Kz-vT)o-;|7iME+K$Zg~%xRJzRd!+3|ciToZ5 zUfDiFJYRUrC_%o?B7e_-+Z{8ShR%5h@&SW<=iM#YcS~F9{=4s<{>_~|wf~Dd$o)IW zx9^;H{?oO~v9jg$PIO$3hmtaC2pB%|XKPocv1J8k3;w0$IQ!U_tJE~2LMI~p{ z6Y(JeY-yA&;_)s9<~+nGQ%i7l;8k=*zk;slCJOC6iKMqq~byf@L?JAvQQY? zKCMur!ceSbv25%8iB5VMQ9ygX)wRTCt6HJ0z8}O@sx}Im1&f!f!$89U#nxFOE6+C$ zU#}Jll%ZxaoJk{*MpJTon=0Cd3R}csuIXGRI&gblQ8*DA48ZB`kXK+zZl7C4wS90m zg zELN5<=}&q?biB%F%OCKQCABJbfmPF+J*R{{j`08KwP+HygnxK}@C!kGu<>})qSnqP z>@3V9^oxz zYP7nzPt1c2fxAMMj(P^a$gF9tG|)jZGyKYAZZqL{smvrvq>?L8SXK2ykq z2w^JZ00KFJe4J2HE{0d4q8$&4)b+nllrOH^IEt*T)A4FbrX0lXl z(KO#`<{ErGY0XWM&-qLf4C=F>U9SwBDU+_&8*gS6YiQ8toTh9m0lLa?mXf;**-Rg+ zkT0o&f4>$$oozZA5r=f7LLq51x~!?rs;(Acf?LAMtHNaf4gF6AKp7k!07OsJWUE(m znegl&0y|{+czK&%p9MtVqHT5oL{E}kM=Q4v@UY%hdtsFqU=#Pj;WT{5haAK$Jme~=)Y{Dhw zwzjgSg0C)m_GRU8kl|z?@SB1Kh}+=sAAyY))&=ADIk27s>mvf|#?*1<2M6SC|J?5q5h71yKbzY( zxAuNl?s;u}uNO~WLtZ)h8o3wsz~M^|9-ezO)Y0NWzKo#xNI!$Tih%QxA3X1&QO}1d z9c&=vr;s1Z&;G&%o9uxbx#W={-`ZO><*ilo+wY$K<(XCU-8;x1-$DLxZ`JHNpFVT* zjd&2FaLGVH;Ch?7qxvaEekxXt_uyXTqpg}tfmc~ISMMx+B38}jNv)d8flnYZff%}0 zh(*#uF|b*6+3x21f3BUr2Flvu3=hU`+RXQ{U}Y4{X#-6+ zU9MJ?^WCgrYdEg9Tk15LavQ%out8(9s9NQ|{Wz=U{8c};-|19L#sNp+~_5?+R|DRLrUpavMpmjwO9e zw3(J$OFWowWYxqXU(_Z>7!VxY?SO(O%P`|u#T*5=CM1~#)e>tJeY{_9vjyHt^i(Bd z{xM+rIBXhTuTaBfxmDnatN`g?mPxSeKD;QTpM*_wX;NLBf!aeh&86Tc@;X03o8}V4 zsmItfmx7N!U0!IFY}8!27H&(DMkb-X4}Bd(o`-5;1JMy&|9!w`HQivLk1_+{6^9D?cQg<~iAWx-z0C z*_XS_;U2LscRBDm*}GV<_UV$nk7m<62i9|7Jy%gzR=6S$+B8q%f^4mf^Gczob9T&Bo47D^s z93jZ|&i1932RH5XJ@AEHeG+Ld%(D|Zi}})CEa$tjsFNS$U!OaMbKv&blfdC{?j%WG zV^u{?!CUeEzX`tNtalYiU$W!q%XPGhKJwO2A6=?dIWN`v*y^zIdags2+;z28rzhYu H`|tk;mDyS& diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannel.tx b/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannel.tx deleted file mode 100644 index 69b965375f8324fbac507d44666cdaee5b3789a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 zcmdMGZizUo3-WX^en`26DW?r$95*K?=YGO)iQL&J? z5HAO_5GPy!SxtCRW(kTKr~r~0sEI-nLVQ4DxVWHv0bt-j?9zhLQc5U(6A=>P5(rMr KEyzhl_!t1bt6EI} diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg1MSPanchors.tx b/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg1MSPanchors.tx deleted file mode 100644 index 82ffeedaa4bac7acd7c004cb8966c363f2823de4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmd;@$;8Fa#mm8@#95q}oROH9mzpEg%EZ;g#DydfE)>ee?O0HdlbM`Yl9`_;8yp~{FU8Kq3}P@SadWW;r6#7N78OG{;YFDx5Dpg?n`26DW*$&N3(At3 z%_ua35!L7pMxfa>2(t@07^TdBO7fC3@{0meL1w87$#O|^i4_1j2738GH|V8SB<2?6 br0ON-=L&S2OTmnXy9&u}+%AN<3Pu9}xC2QF diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg2MSPanchors.tx b/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sachannelOrg2MSPanchors.tx deleted file mode 100644 index 214d9f1d94240fac5940b301831f97609ace1ec9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmd;@$;8Fa#mm8@#95q}oROH9mzpEg%EZ;g#DydfE)>ee?O0HdlbM`Yl9`_;MJW(k<11yv(8 zn^9;6BdXCIj6kz%5M~#0Fv3ljG6Sm3OU}qI3P=SRq%I`OCCw#P0OT0x8mIu08mNgv5<+}HW4O4Wd;wtaK L%q_@CMfey1#KKz> diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannelOrg1MSPanchors.tx b/fabric-chaincode-integration-test/src/test/resources/first-network/channel-artifacts/sbechannelOrg1MSPanchors.tx deleted file mode 100644 index f4043c547c60f8143f7ea8b70893f301cd2ff27f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmd;@&BP_Z#mB*<#8sS>nw*iCmzSC&)W*cs%*2H(5-t?V#qC&7kdv95Sdy8aC*;P# zC}hRO?q8H{=o=g$q%XzJ#SCIFC~nw*iCmzSC&)W*cs%*2H(5-t?V#qC&7kdv95Sdy8aC*;P# zC}hRO?q8H{G%O%YvRsiG}=;Z?)qnBEd em|KvOs+XLfE6{B&1+@p{61e3!od|Okj0ONms7c`f diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/configtx.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/configtx.yaml deleted file mode 100644 index 9990a736a..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/configtx.yaml +++ /dev/null @@ -1,321 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -################################################################################ -# -# Section: Organizations -# -# - This section defines the different organizational identities which will -# be referenced later in the configuration. -# -################################################################################ -Organizations: - - # SampleOrg 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: OrdererOrg - - # 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: - Readers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Writers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Admins: - Type: Signature - Rule: "OR('OrdererMSP.admin')" - - - &Org1 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org1MSP - - # ID to load the MSP definition as - ID: Org1MSP - - MSPDir: crypto-config/peerOrganizations/org1.example.com/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org1MSP.admin')" - - # leave this flag set to true. - 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 - - - &Org2 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org2MSP - - # ID to load the MSP definition as - ID: Org2MSP - - MSPDir: crypto-config/peerOrganizations/org2.example.com/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org2MSP.admin')" - - 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 - -################################################################################ -# -# SECTION: Capabilities -# -# - This section defines the capabilities of fabric network. This is a new -# concept as of v1.1.0 and should not be utilized in mixed networks with -# v1.0.x peers and orderers. Capabilities define features which must be -# present in a fabric binary for that binary to safely participate in the -# fabric network. For instance, if a new MSP type is added, newer binaries -# might recognize and validate the signatures from this type, while older -# binaries without this support would be unable to validate those -# transactions. This could lead to different versions of the fabric binaries -# having different world states. Instead, defining a capability for a channel -# informs those binaries without this capability that they must cease -# processing transactions until they have been upgraded. For v1.0.x if any -# capabilities are defined (including a map with all capabilities turned off) -# then the v1.0.x peer will deliberately crash. -# -################################################################################ -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.3 for Channel is a catchall flag for behavior which has been - # determined to be desired for all orderers and peers running at the v1.3.x - # level, but which would be incompatible with orderers and peers from - # prior releases. - # Prior to enabling V1.3 channel capabilities, ensure that all - # orderers and peers on a channel are at v1.3.0 or later. - V1_3: true - - # Orderer capabilities apply only to the orderers, and may be safely - # used with prior release peers. - # Set the value of the capability to true to require it. - Orderer: &OrdererCapabilities - # V1.1 for Orderer is a catchall flag for behavior which has been - # determined to be desired for all orderers running at the v1.1.x - # level, but which would be incompatible with orderers from prior releases. - # Prior to enabling V1.1 orderer capabilities, ensure that all - # orderers on a channel are at v1.1.0 or later. - V1_1: true - - # Application capabilities apply only to the peer network, and may be safely - # used with prior release orderers. - # Set the value of the capability to true to require it. - Application: &ApplicationCapabilities - # V1.3 for Application enables the new non-backwards compatible - # features and fixes of fabric v1.3. - V1_3: true - # V1.2 for Application enables the new non-backwards compatible - # features and fixes of fabric v1.2 (note, this need not be set if - # later version capabilities are set) - V1_2: false - # V1.1 for Application enables the new non-backwards compatible - # features and fixes of fabric v1.1 (note, this need not be set if - # later version capabilities are set). - V1_1: false - -################################################################################ -# -# 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: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - -################################################################################ -# -# 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: 2s - - # 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: 99 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" - -################################################################################ -# -# 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 - -################################################################################ -# -# 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: - Consortium: SampleConsortium - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - - *Org2 - Capabilities: - <<: *ApplicationCapabilities diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config.yaml deleted file mode 100644 index 73b444d8c..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# 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 - EnableNodeOUs: true - # --------------------------------------------------------------------------- - # "Specs" - # --------------------------------------------------------------------------- - # Uncomment this section to enable the explicit definition of hosts in your - # configuration. Most users will want to use Template, below - # - # Specs is an array of Spec entries. Each Spec entry consists of two fields: - # - Hostname: (Required) The desired hostname, sans the domain. - # - CommonName: (Optional) Specifies the template or explicit override for - # the CN. By default, this is the template: - # - # "{{.Hostname}}.{{.Domain}}" - # - # which obtains its values from the Spec.Hostname and - # Org.Domain, respectively. - # --------------------------------------------------------------------------- - # Specs: - # - Hostname: foo # implicitly "foo.org1.example.com" - # CommonName: foo27.org5.example.com # overrides Hostname-based FQDN set above - # - Hostname: bar - # - Hostname: baz - # --------------------------------------------------------------------------- - # "Template" - # --------------------------------------------------------------------------- - # Allows for the definition of 1 or more hosts that are created sequentially - # from a template. By default, this looks like "peer%d" from 0 to Count-1. - # You may override the number of nodes (Count), the starting index (Start) - # or the template used to construct the name (Hostname). - # - # Note: Template and Specs are not mutually exclusive. You may define both - # sections and the aggregate nodes will be created for you. Take care with - # name collisions - # --------------------------------------------------------------------------- - Template: - Count: 2 - # Start: 5 - # Hostname: {{.Prefix}}{{.Index}} # default - # --------------------------------------------------------------------------- - # "Users" - # --------------------------------------------------------------------------- - # Count: The number of user accounts _in addition_ to Admin - # --------------------------------------------------------------------------- - Users: - Count: 1 - # --------------------------------------------------------------------------- - # Org2: See "Org1" for full specification - # --------------------------------------------------------------------------- - - Name: Org2 - Domain: org2.example.com - EnableNodeOUs: true - Template: - Count: 2 - Users: - Count: 1 diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem deleted file mode 100644 index 6571d594c..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQNET/G+fKGHpY3BVC7oxgHTAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAMWft13imTVGorvor2s3TLfpWqu -d141L6wQXWtQbeP9O5xrCnwnuKmwrHyhsZTvPkjzCX4O+qXtD4mv24Ar+3SjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEINwOeUsQkcQ+8WRXQU4TcecbiY0kYqmsD5KK+OE6Bgu3MAoG -CCqGSM49BAMCA0cAMEQCIB3jmkvoVRIYrEiOAg28spX8GzlslmCVvi/CaOmtDSK2 -AiBlj/A2x9AQwO5KTiqtau6R0oVlTv8/04utTEF4p9ElhA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/dc0e794b1091c43ef16457414e1371e71b898d2462a9ac0f928af8e13a060bb7_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/dc0e794b1091c43ef16457414e1371e71b898d2462a9ac0f928af8e13a060bb7_sk deleted file mode 100644 index ed1994327..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/ca/dc0e794b1091c43ef16457414e1371e71b898d2462a9ac0f928af8e13a060bb7_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7jXyr0XJtg/i60jM -bGLJJMJ+EoR2+9hP5Ktv270aSkuhRANCAAQDFn7dd4pk1RqK76K9rN0y36Vqrnde -NS+sEF1rUG3j/Tucawp8J7ipsKx8obGU7z5I8wl+Dvql7Q+Jr9uAK/t0 ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index 3ed13a3ae..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRAJTI2zLzuC76M3s3/Q0d2RowCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABFqoXGQaetJ3LheGBBOz4GZjWM3xaMB7SbIQdLNe/3P1OeNLsiQ0 -SUVmxAs7fn9S6kH7t+ugqQStjxoE5IApR56jTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAINwOeUsQkcQ+8WRXQU4TcecbiY0kYqms -D5KK+OE6Bgu3MAoGCCqGSM49BAMCA0gAMEUCIQCEYHi4UuUY3kJzOJK8hG54XqOL -T06R/8AZICpU2Y4VZAIgNNXeUJI9TDWkE+KAXw+e4krhfeMxORnV9yaR46JfiQE= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index 6571d594c..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQNET/G+fKGHpY3BVC7oxgHTAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAMWft13imTVGorvor2s3TLfpWqu -d141L6wQXWtQbeP9O5xrCnwnuKmwrHyhsZTvPkjzCX4O+qXtD4mv24Ar+3SjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEINwOeUsQkcQ+8WRXQU4TcecbiY0kYqmsD5KK+OE6Bgu3MAoG -CCqGSM49BAMCA0cAMEQCIB3jmkvoVRIYrEiOAg28spX8GzlslmCVvi/CaOmtDSK2 -AiBlj/A2x9AQwO5KTiqtau6R0oVlTv8/04utTEF4p9ElhA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index 3bbd7e847..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdugAwIBAgIQBWynKYPejLKZi2OZMRfZbzAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF9YBOQTJQhMnsXf14Rn -aXsNrgdodap+XQkKykKs3Ceu7TvZDXkTbej4yT6qkgPGk6OwVvCFR7JFoZ0lEfZn -8uyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEIPOFeBYgv4ZL3683RMKmvHFHBN78Rs180vAU7KSP -uoXpMAoGCCqGSM49BAMCA0cAMEQCIArgukQOnnwW3p0VJdE/5ipHSwDeA+zfz1uu -QERmikgQAiA89fD3ToEkXNEgaARxV20I5y4LfgGTcfmIB3XgA8VtVA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index 3ed13a3ae..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRAJTI2zLzuC76M3s3/Q0d2RowCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABFqoXGQaetJ3LheGBBOz4GZjWM3xaMB7SbIQdLNe/3P1OeNLsiQ0 -SUVmxAs7fn9S6kH7t+ugqQStjxoE5IApR56jTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAINwOeUsQkcQ+8WRXQU4TcecbiY0kYqms -D5KK+OE6Bgu3MAoGCCqGSM49BAMCA0gAMEUCIQCEYHi4UuUY3kJzOJK8hG54XqOL -T06R/8AZICpU2Y4VZAIgNNXeUJI9TDWkE+KAXw+e4krhfeMxORnV9yaR46JfiQE= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index 6571d594c..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQNET/G+fKGHpY3BVC7oxgHTAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAMWft13imTVGorvor2s3TLfpWqu -d141L6wQXWtQbeP9O5xrCnwnuKmwrHyhsZTvPkjzCX4O+qXtD4mv24Ar+3SjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEINwOeUsQkcQ+8WRXQU4TcecbiY0kYqmsD5KK+OE6Bgu3MAoG -CCqGSM49BAMCA0cAMEQCIB3jmkvoVRIYrEiOAg28spX8GzlslmCVvi/CaOmtDSK2 -AiBlj/A2x9AQwO5KTiqtau6R0oVlTv8/04utTEF4p9ElhA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/9532dfa1f6fd6f195b538dad5e3d5df1715a0b545c17308a1de0dd9d19a014da_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/9532dfa1f6fd6f195b538dad5e3d5df1715a0b545c17308a1de0dd9d19a014da_sk deleted file mode 100644 index d08ac387e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/9532dfa1f6fd6f195b538dad5e3d5df1715a0b545c17308a1de0dd9d19a014da_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgUPf3YHvZwgCYfcai -CFJ+jLSqw+V6HK4RyokL6ZACrjihRANCAARDg5HsFRUdgPm82gJb8Ra2jrwYy0gN -f5AbzggvpUVz0eAz84aXRtBTzIUmg32wq17ANu7Dv2okqzfL6E8+68+a ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem deleted file mode 100644 index 679d85c45..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbKgAwIBAgIQPOtMJjB0+Ru0HEUJ76YafjAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowWDELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggq -hkjOPQMBBwNCAARDg5HsFRUdgPm82gJb8Ra2jrwYy0gNf5AbzggvpUVz0eAz84aX -RtBTzIUmg32wq17ANu7Dv2okqzfL6E8+68+ao00wSzAOBgNVHQ8BAf8EBAMCB4Aw -DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCDcDnlLEJHEPvFkV0FOE3HnG4mNJGKp -rA+SivjhOgYLtzAKBggqhkjOPQQDAgNHADBEAiBd8kOcUWo5lLjG4NJ0erWUqT3G -ZxjtWwpHTGigMq9jvAIgGF1saLkzgstyPxeOKX4jMAmML5JT4Vsi8DmZ2vrhwfw= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index 3bbd7e847..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdugAwIBAgIQBWynKYPejLKZi2OZMRfZbzAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF9YBOQTJQhMnsXf14Rn -aXsNrgdodap+XQkKykKs3Ceu7TvZDXkTbej4yT6qkgPGk6OwVvCFR7JFoZ0lEfZn -8uyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEIPOFeBYgv4ZL3683RMKmvHFHBN78Rs180vAU7KSP -uoXpMAoGCCqGSM49BAMCA0cAMEQCIArgukQOnnwW3p0VJdE/5ipHSwDeA+zfz1uu -QERmikgQAiA89fD3ToEkXNEgaARxV20I5y4LfgGTcfmIB3XgA8VtVA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt deleted file mode 100644 index 3bbd7e847..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdugAwIBAgIQBWynKYPejLKZi2OZMRfZbzAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF9YBOQTJQhMnsXf14Rn -aXsNrgdodap+XQkKykKs3Ceu7TvZDXkTbej4yT6qkgPGk6OwVvCFR7JFoZ0lEfZn -8uyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEIPOFeBYgv4ZL3683RMKmvHFHBN78Rs180vAU7KSP -uoXpMAoGCCqGSM49BAMCA0cAMEQCIArgukQOnnwW3p0VJdE/5ipHSwDeA+zfz1uu -QERmikgQAiA89fD3ToEkXNEgaARxV20I5y4LfgGTcfmIB3XgA8VtVA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt deleted file mode 100644 index 4d6f548e4..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWTCCAf+gAwIBAgIQdi54q2dgARZiLRHNM21LfjAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowWDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIB -BggqhkjOPQMBBwNCAAQiuCRMPhYXv2w1/pjwUC2qXjeYIuLkb5FXqaOu/8jNhuu3 -DV76mI2tKYGVNi5qTwqrbI5YEl2B39eMv356Q3lho4GWMIGTMA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADArBgNVHSMEJDAigCDzhXgWIL+GS9+vN0TCprxxRwTe/EbNfNLwFOykj7qF6TAn -BgNVHREEIDAeghNvcmRlcmVyLmV4YW1wbGUuY29tggdvcmRlcmVyMAoGCCqGSM49 -BAMCA0gAMEUCIQCW8tPwpmgq34hRE5qFo5NT1kKJKPoMLfTxvL8zsQG9JAIgI/Or -I90oDXdBV3Y0QuvhjF3oXHxktQJ8B48CxmpOx5E= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key deleted file mode 100644 index 999b3418a..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgg6blNvWRT6RuNT4F -2EvwYAnaLkrWfIRavPXacL//npKhRANCAAQiuCRMPhYXv2w1/pjwUC2qXjeYIuLk -b5FXqaOu/8jNhuu3DV76mI2tKYGVNi5qTwqrbI5YEl2B39eMv356Q3lh ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/f385781620bf864bdfaf3744c2a6bc714704defc46cd7cd2f014eca48fba85e9_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/f385781620bf864bdfaf3744c2a6bc714704defc46cd7cd2f014eca48fba85e9_sk deleted file mode 100644 index 64644ed92..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/f385781620bf864bdfaf3744c2a6bc714704defc46cd7cd2f014eca48fba85e9_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgn7T4i87lrB5V4joA -aEwZJ1ZGyBt8GHYt0FmDj3AqEuuhRANCAARfWATkEyUITJ7F39eEZ2l7Da4HaHWq -fl0JCspCrNwnru072Q15E23o+Mk+qpIDxpOjsFbwhUeyRaGdJRH2Z/Ls ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem deleted file mode 100644 index 3bbd7e847..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdugAwIBAgIQBWynKYPejLKZi2OZMRfZbzAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF9YBOQTJQhMnsXf14Rn -aXsNrgdodap+XQkKykKs3Ceu7TvZDXkTbej4yT6qkgPGk6OwVvCFR7JFoZ0lEfZn -8uyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEIPOFeBYgv4ZL3683RMKmvHFHBN78Rs180vAU7KSP -uoXpMAoGCCqGSM49BAMCA0cAMEQCIArgukQOnnwW3p0VJdE/5ipHSwDeA+zfz1uu -QERmikgQAiA89fD3ToEkXNEgaARxV20I5y4LfgGTcfmIB3XgA8VtVA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index 3ed13a3ae..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRAJTI2zLzuC76M3s3/Q0d2RowCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABFqoXGQaetJ3LheGBBOz4GZjWM3xaMB7SbIQdLNe/3P1OeNLsiQ0 -SUVmxAs7fn9S6kH7t+ugqQStjxoE5IApR56jTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAINwOeUsQkcQ+8WRXQU4TcecbiY0kYqms -D5KK+OE6Bgu3MAoGCCqGSM49BAMCA0gAMEUCIQCEYHi4UuUY3kJzOJK8hG54XqOL -T06R/8AZICpU2Y4VZAIgNNXeUJI9TDWkE+KAXw+e4krhfeMxORnV9yaR46JfiQE= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index 6571d594c..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLjCCAdWgAwIBAgIQNET/G+fKGHpY3BVC7oxgHTAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAMWft13imTVGorvor2s3TLfpWqu -d141L6wQXWtQbeP9O5xrCnwnuKmwrHyhsZTvPkjzCX4O+qXtD4mv24Ar+3SjXzBd -MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB -Af8wKQYDVR0OBCIEINwOeUsQkcQ+8WRXQU4TcecbiY0kYqmsD5KK+OE6Bgu3MAoG -CCqGSM49BAMCA0cAMEQCIB3jmkvoVRIYrEiOAg28spX8GzlslmCVvi/CaOmtDSK2 -AiBlj/A2x9AQwO5KTiqtau6R0oVlTv8/04utTEF4p9ElhA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/b0b3c309a7d201898f6572bd1381220cf4bb57f3d43349b91b46cbe02b010c17_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/b0b3c309a7d201898f6572bd1381220cf4bb57f3d43349b91b46cbe02b010c17_sk deleted file mode 100644 index 15598af3a..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/b0b3c309a7d201898f6572bd1381220cf4bb57f3d43349b91b46cbe02b010c17_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2fA61DlA94vop9M3 -5DXofpSWNm6ZomzvvLAnI93ev7ChRANCAARaqFxkGnrSdy4XhgQTs+BmY1jN8WjA -e0myEHSzXv9z9TnjS7IkNElFZsQLO35/UupB+7froKkErY8aBOSAKUee ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem deleted file mode 100644 index 3ed13a3ae..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRAJTI2zLzuC76M3s3/Q0d2RowCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABFqoXGQaetJ3LheGBBOz4GZjWM3xaMB7SbIQdLNe/3P1OeNLsiQ0 -SUVmxAs7fn9S6kH7t+ugqQStjxoE5IApR56jTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAINwOeUsQkcQ+8WRXQU4TcecbiY0kYqms -D5KK+OE6Bgu3MAoGCCqGSM49BAMCA0gAMEUCIQCEYHi4UuUY3kJzOJK8hG54XqOL -T06R/8AZICpU2Y4VZAIgNNXeUJI9TDWkE+KAXw+e4krhfeMxORnV9yaR46JfiQE= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index 3bbd7e847..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdugAwIBAgIQBWynKYPejLKZi2OZMRfZbzAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF9YBOQTJQhMnsXf14Rn -aXsNrgdodap+XQkKykKs3Ceu7TvZDXkTbej4yT6qkgPGk6OwVvCFR7JFoZ0lEfZn -8uyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEIPOFeBYgv4ZL3683RMKmvHFHBN78Rs180vAU7KSP -uoXpMAoGCCqGSM49BAMCA0cAMEQCIArgukQOnnwW3p0VJdE/5ipHSwDeA+zfz1uu -QERmikgQAiA89fD3ToEkXNEgaARxV20I5y4LfgGTcfmIB3XgA8VtVA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt deleted file mode 100644 index 3bbd7e847..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNDCCAdugAwIBAgIQBWynKYPejLKZi2OZMRfZbzAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTE4MTExNTA5Mzg0NloXDTI4MTExMjA5Mzg0NlowbDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt -cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF9YBOQTJQhMnsXf14Rn -aXsNrgdodap+XQkKykKs3Ceu7TvZDXkTbej4yT6qkgPGk6OwVvCFR7JFoZ0lEfZn -8uyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB -/wQFMAMBAf8wKQYDVR0OBCIEIPOFeBYgv4ZL3683RMKmvHFHBN78Rs180vAU7KSP -uoXpMAoGCCqGSM49BAMCA0cAMEQCIArgukQOnnwW3p0VJdE/5ipHSwDeA+zfz1uu -QERmikgQAiA89fD3ToEkXNEgaARxV20I5y4LfgGTcfmIB3XgA8VtVA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt deleted file mode 100644 index 852afedbb..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLTCCAdOgAwIBAgIRAJBjTQw5sByiU7pxzX0BvpwwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZaMFYxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABP+Z6wR/ADmC4Th1eR0djk7pcwumqpHBc3Ul611TcYdhp4f9 -0aq8MCC6CiIOuD99hZj/s+SjfFCmNc7uENbhYAWjbDBqMA4GA1UdDwEB/wQEAwIF -oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAr -BgNVHSMEJDAigCDzhXgWIL+GS9+vN0TCprxxRwTe/EbNfNLwFOykj7qF6TAKBggq -hkjOPQQDAgNIADBFAiEA3RneU15eqdXGpbNdqQamGrGmxdTv3fknZVaKK5feAUQC -IEZZIKfABDdUP7pgATYT1fB7MS/DLoehn+UUvszu5lJk ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key deleted file mode 100644 index ca2773f41..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg98UVRmTsX7AZcfvZ -P8IVkw3v3si5vZvhY3gf1MzRM2ahRANCAAT/mesEfwA5guE4dXkdHY5O6XMLpqqR -wXN1JetdU3GHYaeH/dGqvDAgugoiDrg/fYWY/7Pko3xQpjXO7hDW4WAF ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/4d1dfcb3e47e5a89357d7cda73bf8c3bb620cc571007f5b68e1f6a0766258005_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/4d1dfcb3e47e5a89357d7cda73bf8c3bb620cc571007f5b68e1f6a0766258005_sk deleted file mode 100644 index 46a7d511e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/4d1dfcb3e47e5a89357d7cda73bf8c3bb620cc571007f5b68e1f6a0766258005_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgyAW8yAucYRU5tCJ5 -pS3PCjEQwIv6a2nr6YMkC+tj3yGhRANCAAQmXbiLOUqFyMVAR/50zrOg5xVedUOL -ML7RaNtRsz0vncVteOSjkTp+T35sk7l2RMEQfscLPavJ4nvn74RhHM4C ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem deleted file mode 100644 index 2318e4735..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQdNQf8K4BqjqxgOF4u3BH+jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDVaFw0yODExMTIwOTM4NDVa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Jl24izlKhcjFQEf+dM6zoOcVXnVDizC+0WjbUbM9L53FbXjko5E6fk9+bJO5dkTB -EH7HCz2ryeJ75++EYRzOAqNfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgTR38s+R+Wok1fXzac7+M -O7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0EAwIDRwAwRAIgJ2/qnnB9OtxFGOpK -vE0zF73EMU4aSuMqN7P+wWPdWQACIE0zXuNVS99QtvbKnXnWd0hvzFbjZJnuEv1U -b6V9We14 ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 8a588519e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIRAKk7ZyiJabExeylStPCwEjswCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv -cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHV6GAdkT -f55aSsAygbtJw69K4Dgo/Es/FKEl/PyPfBLQpYLUBjCrkyCBgKzwfWYJtzbp61ZV -sqYj3nrcGlhuQqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZI -zj0EAwIDSAAwRQIhANmMV09w/N3hOqt9ucjZmi9qaHEobFFJL9UsQxnLraMJAiA9 -Z7qkP73ZepGwvxyiqb/60kXIe9OcQk0vzBHEOUtOaw== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 2318e4735..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQdNQf8K4BqjqxgOF4u3BH+jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDVaFw0yODExMTIwOTM4NDVa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Jl24izlKhcjFQEf+dM6zoOcVXnVDizC+0WjbUbM9L53FbXjko5E6fk9+bJO5dkTB -EH7HCz2ryeJ75++EYRzOAqNfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgTR38s+R+Wok1fXzac7+M -O7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0EAwIDRwAwRAIgJ2/qnnB9OtxFGOpK -vE0zF73EMU4aSuMqN7P+wWPdWQACIE0zXuNVS99QtvbKnXnWd0hvzFbjZJnuEv1U -b6V9We14 ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml deleted file mode 100644 index f04487054..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -NodeOUs: - Enable: true - ClientOUIdentifier: - Certificate: cacerts/ca.org1.example.com-cert.pem - OrganizationalUnitIdentifier: client - PeerOUIdentifier: - Certificate: cacerts/ca.org1.example.com-cert.pem - OrganizationalUnitIdentifier: peer diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 8a588519e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIRAKk7ZyiJabExeylStPCwEjswCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv -cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHV6GAdkT -f55aSsAygbtJw69K4Dgo/Es/FKEl/PyPfBLQpYLUBjCrkyCBgKzwfWYJtzbp61ZV -sqYj3nrcGlhuQqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZI -zj0EAwIDSAAwRQIhANmMV09w/N3hOqt9ucjZmi9qaHEobFFJL9UsQxnLraMJAiA9 -Z7qkP73ZepGwvxyiqb/60kXIe9OcQk0vzBHEOUtOaw== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 2318e4735..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQdNQf8K4BqjqxgOF4u3BH+jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDVaFw0yODExMTIwOTM4NDVa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Jl24izlKhcjFQEf+dM6zoOcVXnVDizC+0WjbUbM9L53FbXjko5E6fk9+bJO5dkTB -EH7HCz2ryeJ75++EYRzOAqNfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgTR38s+R+Wok1fXzac7+M -O7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0EAwIDRwAwRAIgJ2/qnnB9OtxFGOpK -vE0zF73EMU4aSuMqN7P+wWPdWQACIE0zXuNVS99QtvbKnXnWd0hvzFbjZJnuEv1U -b6V9We14 ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml deleted file mode 100644 index f04487054..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -NodeOUs: - Enable: true - ClientOUIdentifier: - Certificate: cacerts/ca.org1.example.com-cert.pem - OrganizationalUnitIdentifier: client - PeerOUIdentifier: - Certificate: cacerts/ca.org1.example.com-cert.pem - OrganizationalUnitIdentifier: peer diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/87169e9fbaf4a3e33b2d169bdf8cef41f90e1f1836e8dc9b304bd0e0e15de4cd_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/87169e9fbaf4a3e33b2d169bdf8cef41f90e1f1836e8dc9b304bd0e0e15de4cd_sk deleted file mode 100644 index 41b937907..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/87169e9fbaf4a3e33b2d169bdf8cef41f90e1f1836e8dc9b304bd0e0e15de4cd_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgwCvxZ2waNum1U3j9 -QskgKjGzb1o/b7nwaXAJftXpBiyhRANCAAT0Bs8+cA8w4maslJUFe8ZBVXh3L868 -Y5KsOwb6fPbnNRNg1nQDCqPKkn7dK0WmQaZwNgfUo+ZPEWVTHBMTukr+ ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem deleted file mode 100644 index 29f1fedd3..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICJzCCAc6gAwIBAgIQIR6jo1oQc12oUSbhkby0EzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQLEwRwZWVyMR8wHQYDVQQDExZwZWVyMC5vcmcx -LmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9AbPPnAPMOJm -rJSVBXvGQVV4dy/OvGOSrDsG+nz25zUTYNZ0AwqjypJ+3StFpkGmcDYH1KPmTxFl -UxwTE7pK/qNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0j -BCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0E -AwIDRwAwRAIgWEgmRBZUU9lguvCZbI7oucRSkymOrbbe6qBjgFZMr4MCIBNPX0U1 -BikEgyu4YGbcaBB0TS/jEy9mOmIt0j7Xit1B ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt deleted file mode 100644 index 08c50a4c2..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICaDCCAg6gAwIBAgIRAOgldXLSd+zWfbcL8UqhmK8wCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNu8e61J/vKnCHOcLcQ76zr7LeBW -jZLJxoyUH4VrxYZQ5mwXkrMMwhxTGZn/hZ+cT7JfiVxRMmwcDp4bboSziTmjgZcw -gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIE/A7Umo8xz2JsuRmbdncwPLaSKl -znIs2PTvbpKjRtWcMCgGA1UdEQQhMB+CFnBlZXIwLm9yZzEuZXhhbXBsZS5jb22C -BXBlZXIwMAoGCCqGSM49BAMCA0gAMEUCIQCPokRO2MzgUSxAs2G5jcYbQHIJrqmm -pcyg7ceY0Uk/ngIgYfz0mKVIDM8hdnAMYroDNOs5/F3g8OnjD2JQ5eVcH6Y= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key deleted file mode 100644 index 3286b60c9..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgjnRmyalT/7NKE2mR -9tJJLUg/PO74IoTo8h8VfJUd+FWhRANCAATbvHutSf7ypwhznC3EO+s6+y3gVo2S -ycaMlB+Fa8WGUOZsF5KzDMIcUxmZ/4WfnE+yX4lcUTJsHA6eG26Es4k5 ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 8a588519e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIRAKk7ZyiJabExeylStPCwEjswCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv -cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHV6GAdkT -f55aSsAygbtJw69K4Dgo/Es/FKEl/PyPfBLQpYLUBjCrkyCBgKzwfWYJtzbp61ZV -sqYj3nrcGlhuQqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZI -zj0EAwIDSAAwRQIhANmMV09w/N3hOqt9ucjZmi9qaHEobFFJL9UsQxnLraMJAiA9 -Z7qkP73ZepGwvxyiqb/60kXIe9OcQk0vzBHEOUtOaw== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 2318e4735..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQdNQf8K4BqjqxgOF4u3BH+jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDVaFw0yODExMTIwOTM4NDVa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Jl24izlKhcjFQEf+dM6zoOcVXnVDizC+0WjbUbM9L53FbXjko5E6fk9+bJO5dkTB -EH7HCz2ryeJ75++EYRzOAqNfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgTR38s+R+Wok1fXzac7+M -O7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0EAwIDRwAwRAIgJ2/qnnB9OtxFGOpK -vE0zF73EMU4aSuMqN7P+wWPdWQACIE0zXuNVS99QtvbKnXnWd0hvzFbjZJnuEv1U -b6V9We14 ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/config.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/config.yaml deleted file mode 100644 index f04487054..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -NodeOUs: - Enable: true - ClientOUIdentifier: - Certificate: cacerts/ca.org1.example.com-cert.pem - OrganizationalUnitIdentifier: client - PeerOUIdentifier: - Certificate: cacerts/ca.org1.example.com-cert.pem - OrganizationalUnitIdentifier: peer diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/540b89c87b4e781e9e43230c0f9c790d8c00057e755969f9309c28cc0d629eda_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/540b89c87b4e781e9e43230c0f9c790d8c00057e755969f9309c28cc0d629eda_sk deleted file mode 100644 index 4b0ee0e62..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/540b89c87b4e781e9e43230c0f9c790d8c00057e755969f9309c28cc0d629eda_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzvMJJCwvWS+Q+gKM -QNkptsjZL/93XcN83jY1m48dWLOhRANCAAQOW1C+r3gcuhIXleTLVAJR2xaw/JX4 -mFZ8HSh9dVDUAz5eInaiV0lzFEKyJ3dq5m1/8+J20zxZVgjwMdqJU+DE ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem deleted file mode 100644 index 9a527f411..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICJzCCAc6gAwIBAgIQH233bKPnyI+XcTc6qFD9LDAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQLEwRwZWVyMR8wHQYDVQQDExZwZWVyMS5vcmcx -LmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDltQvq94HLoS -F5Xky1QCUdsWsPyV+JhWfB0ofXVQ1AM+XiJ2oldJcxRCsid3auZtf/PidtM8WVYI -8DHaiVPgxKNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0j -BCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0E -AwIDRwAwRAIgRRB8ZzUy4jbQh4xCc5MpaTTluTqUOqSz7W4TcFLHJ0ECIE6oFqTi -kE/thR6y2HzxVCXaZCjsTLju83tW/SRjBtNv ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt deleted file mode 100644 index ef715e894..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICZzCCAg6gAwIBAgIRAINwAPBjrUPXpCX28M6APpowCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABFm7mlT43ERJYeblN6vDrk2qr4Mb -J+Jph44bqmPGeUfyBQ/r846m2hIquEgV0nXuIK0eIARXeV6rLEt/d3DkDJajgZcw -gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIE/A7Umo8xz2JsuRmbdncwPLaSKl -znIs2PTvbpKjRtWcMCgGA1UdEQQhMB+CFnBlZXIxLm9yZzEuZXhhbXBsZS5jb22C -BXBlZXIxMAoGCCqGSM49BAMCA0cAMEQCICFNrX2O7VNEQZ7pCau9SEzBXz9Jj7be -87/mym5d2JRSAiAu61KX50H1HSPNNvvJHXyC91N9AZ6dVq3PF8or4dKCzA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key deleted file mode 100644 index 26118b030..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7a+5bbImqBeGrF8g -oqzarSJfrzv3NjG+AzT6chinVsihRANCAARZu5pU+NxESWHm5Terw65Nqq+DGyfi -aYeOG6pjxnlH8gUP6/OOptoSKrhIFdJ17iCtHiAEV3leqyxLf3dw5AyW ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/4fc0ed49a8f31cf626cb9199b7677303cb6922a5ce722cd8f4ef6e92a346d59c_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/4fc0ed49a8f31cf626cb9199b7677303cb6922a5ce722cd8f4ef6e92a346d59c_sk deleted file mode 100644 index 29d85f185..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/4fc0ed49a8f31cf626cb9199b7677303cb6922a5ce722cd8f4ef6e92a346d59c_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgOllB2d+5eJFCb8Os -yHgtUqvNeaW4+ndzkzSTYig6GzihRANCAAQVT6rnMbzn4leIeG4KLLPwq5143OFa -B3LkBuGJ5KeGvRSHe/GEinqPCyXvbesRCYGW3HFCAqx2PzBZiVY056RM ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 8a588519e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIRAKk7ZyiJabExeylStPCwEjswCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv -cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHV6GAdkT -f55aSsAygbtJw69K4Dgo/Es/FKEl/PyPfBLQpYLUBjCrkyCBgKzwfWYJtzbp61ZV -sqYj3nrcGlhuQqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZI -zj0EAwIDSAAwRQIhANmMV09w/N3hOqt9ucjZmi9qaHEobFFJL9UsQxnLraMJAiA9 -Z7qkP73ZepGwvxyiqb/60kXIe9OcQk0vzBHEOUtOaw== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 2318e4735..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQdNQf8K4BqjqxgOF4u3BH+jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDVaFw0yODExMTIwOTM4NDVa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Jl24izlKhcjFQEf+dM6zoOcVXnVDizC+0WjbUbM9L53FbXjko5E6fk9+bJO5dkTB -EH7HCz2ryeJ75++EYRzOAqNfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgTR38s+R+Wok1fXzac7+M -O7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0EAwIDRwAwRAIgJ2/qnnB9OtxFGOpK -vE0zF73EMU4aSuMqN7P+wWPdWQACIE0zXuNVS99QtvbKnXnWd0hvzFbjZJnuEv1U -b6V9We14 ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/23acbdca52b60346fb189be8846f5799b379fcd582bdde8230641ff2eb2ae883_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/23acbdca52b60346fb189be8846f5799b379fcd582bdde8230641ff2eb2ae883_sk deleted file mode 100644 index a7c9bc850..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/23acbdca52b60346fb189be8846f5799b379fcd582bdde8230641ff2eb2ae883_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgkCvjPhh13E8g1vwp -4+v/j3//WX8J1JLzj0YQGHPzj9ShRANCAAQdXoYB2RN/nlpKwDKBu0nDr0rgOCj8 -Sz8UoSX8/I98EtClgtQGMKuTIIGArPB9Zgm3NunrVlWypiPeetwaWG5C ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 8a588519e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIRAKk7ZyiJabExeylStPCwEjswCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv -cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHV6GAdkT -f55aSsAygbtJw69K4Dgo/Es/FKEl/PyPfBLQpYLUBjCrkyCBgKzwfWYJtzbp61ZV -sqYj3nrcGlhuQqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZI -zj0EAwIDSAAwRQIhANmMV09w/N3hOqt9ucjZmi9qaHEobFFJL9UsQxnLraMJAiA9 -Z7qkP73ZepGwvxyiqb/60kXIe9OcQk0vzBHEOUtOaw== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt deleted file mode 100644 index 22fd56550..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCAeGgAwIBAgIQKxw98lUJLgNY3dU/u9bf/jAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4 -NDZaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAElCf/9VrpZZE8j75Xcp20sxap8rLo -F5nbl9vEeGJIJo4zP9EuRv/BwLQ4MAs8Sf+k3HevuAec9BvqMgJtEtUV9qNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIE/A7Umo8xz2JsuRmbdncwPLaSKlznIs -2PTvbpKjRtWcMAoGCCqGSM49BAMCA0cAMEQCIEeIJ7gY2v25+l0l61AYT+SNrzNz -k73v0TI4cR/ZZ0eJAiBPWqu+c08lAnxK3/WFzEQgZzZTXv0ktew9jQDEwiHKMA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key deleted file mode 100644 index c52116d03..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgJttPo1Cgvc+czX+b -XL74rvN485vduYUp2QXFGkXDGbyhRANCAASUJ//1WullkTyPvldynbSzFqnysugX -mduX28R4YkgmjjM/0S5G/8HAtDgwCzxJ/6Tcd6+4B5z0G+oyAm0S1RX2 ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 6352c2afa..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIRAOszu/4TQaQOUbCnQ6vczbEwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZVc2VyMUBv -cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwfxM+kuV -cwpk/jQ1Zw35D7CvjkFCillW1HFzXGpowTj/sLzIARhqKKywI3+ldTFFt4ozRz/E -WAZuUbl8bnC9+qNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZI -zj0EAwIDRwAwRAIgNe8ize2+7TDXBvWRe3ltY/w1D+BVhViKy47Wgut3S/oCIAaE -oOk4lVAX7C4OQkrxwy0QSwHnaZZTAp6q+Yib41KV ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index 2318e4735..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQdNQf8K4BqjqxgOF4u3BH+jAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDVaFw0yODExMTIwOTM4NDVa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Jl24izlKhcjFQEf+dM6zoOcVXnVDizC+0WjbUbM9L53FbXjko5E6fk9+bJO5dkTB -EH7HCz2ryeJ75++EYRzOAqNfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgTR38s+R+Wok1fXzac7+M -O7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZIzj0EAwIDRwAwRAIgJ2/qnnB9OtxFGOpK -vE0zF73EMU4aSuMqN7P+wWPdWQACIE0zXuNVS99QtvbKnXnWd0hvzFbjZJnuEv1U -b6V9We14 ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/06598da2a5c8268d5e09ff090136c411392fe5af949354b05a5bd8041ec1f8a5_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/06598da2a5c8268d5e09ff090136c411392fe5af949354b05a5bd8041ec1f8a5_sk deleted file mode 100644 index 4a1d4c28d..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/06598da2a5c8268d5e09ff090136c411392fe5af949354b05a5bd8041ec1f8a5_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgbF/niwxbhlbpV1VY -y59gDrqFFXBz8w9D7EFNCYog66ihRANCAATB/Ez6S5VzCmT+NDVnDfkPsK+OQUKK -WVbUcXNcamjBOP+wvMgBGGoorLAjf6V1MUW3ijNHP8RYBm5RuXxucL36 ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 6352c2afa..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdGgAwIBAgIRAOszu/4TQaQOUbCnQ6vczbEwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZVc2VyMUBv -cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwfxM+kuV -cwpk/jQ1Zw35D7CvjkFCillW1HFzXGpowTj/sLzIARhqKKywI3+ldTFFt4ozRz/E -WAZuUbl8bnC9+qNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAgTR38s+R+Wok1fXzac7+MO7YgzFcQB/W2jh9qB2YlgAUwCgYIKoZI -zj0EAwIDRwAwRAIgNe8ize2+7TDXBvWRe3ltY/w1D+BVhViKy47Wgut3S/oCIAaE -oOk4lVAX7C4OQkrxwy0QSwHnaZZTAp6q+Yib41KV ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt deleted file mode 100644 index ded9c1410..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAKs88UHaRq5gTm4Kg142v+swCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABBVPqucxvOfiV4h4bgoss/CrnXjc4VoHcuQG4Ynkp4a9FId78YSKeo8L -Je9t6xEJgZbccUICrHY/MFmJVjTnpEyjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIE/A7Umo8xz2 -JsuRmbdncwPLaSKlznIs2PTvbpKjRtWcMAoGCCqGSM49BAMCA0gAMEUCIQD74u+W -hVYzFdFroMipy5AeXM5IcdiCEkNV0CDrr6SPRwIgJn0xOShj+lXep+s18UX646MJ -yXI7AWyk+mnhPkXljcA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt deleted file mode 100644 index 3abc3cce2..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeKgAwIBAgIRAOpEpSw8VmUe49B/9QmdJWcwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjFAb3JnMS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABBf81/QdaBrKgprIaoTsXTVW8L/K -/2x1ajkCcoxLf07mwcLqhzgqobGt7xPfzDCG4uwyVh4jJqRW5WCyaSOx9WSjbDBq -MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw -DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCBPwO1JqPMc9ibLkZm3Z3MDy2kipc5y -LNj0726So0bVnDAKBggqhkjOPQQDAgNHADBEAiADEpwTunyWkp9KLI3b3teErFHb -6hKs+q5/9VmpciwHaAIgPMcWl9d4MWpD4emLBaq3JDOgcI91fwSEBfqVpawp3MA= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key deleted file mode 100644 index 444065afa..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgcFJcTeIdx0zmWGpn -kYemYgbAalJq/OzesSmVYiws2oihRANCAAQX/Nf0HWgayoKayGqE7F01VvC/yv9s -dWo5AnKMS39O5sHC6oc4KqGxre8T38wwhuLsMlYeIyakVuVgsmkjsfVk ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem deleted file mode 100644 index 37c147196..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQJ8oZo0AuGAKKIWy7eRjw4DAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Mlgbl4mNtQY4q5uPU0d262klJwhUaawoEkZVT5BfMie3K1aHI+Kkonk9xZsYBFCz -aK3J4f+4ZHDovYvD6kYRm6NfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg9eAOH5q7MpHqNZcMYSPp -OHPd3OHlSPOG+WhW6czxaMEwCgYIKoZIzj0EAwIDRwAwRAIgayEyet/eI80iKMdw -/tHMFuq7zF3/EH80HclqBkhgw9UCIA3fkrFY0wyUI6/OUY3dLdh5PLRpmpIyj5Zc -8yt5b2Xc ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/f5e00e1f9abb3291ea35970c6123e93873dddce1e548f386f96856e9ccf168c1_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/f5e00e1f9abb3291ea35970c6123e93873dddce1e548f386f96856e9ccf168c1_sk deleted file mode 100644 index 013adac3a..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/ca/f5e00e1f9abb3291ea35970c6123e93873dddce1e548f386f96856e9ccf168c1_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgRL8kXbwF1bK5Pr6J -vQhYABKJiqNj5pdEEnzKCtNrfamhRANCAAQyWBuXiY21Bjirm49TR3braSUnCFRp -rCgSRlVPkF8yJ7crVocj4qSieT3FmxgEULNorcnh/7hkcOi9i8PqRhGb ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 50445f0db..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdCgAwIBAgIQJ8c+VvDsLnFGlyyOkIqMNzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFkFkbWluQG9y -ZzIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATBjgBjOG8C -ezJ3bDkBSEHE0VUi27pNAL8C85y3pCLaG6kCHWXkmIQ4s/2jFEXuJ/1BE5e/y3H0 -X3dvBno0ROOto00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV -HSMEJDAigCD14A4fmrsykeo1lwxhI+k4c93c4eVI84b5aFbpzPFowTAKBggqhkjO -PQQDAgNIADBFAiEAtJgKgmQ3a5QlIyNO5hNVhCPGLg6siAFHB6M/J/TnYlkCIFUS -+iOOAzIHQafkBTKszTAR1Hb/jBX7PH+JbsVwRDoJ ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 37c147196..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQJ8oZo0AuGAKKIWy7eRjw4DAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Mlgbl4mNtQY4q5uPU0d262klJwhUaawoEkZVT5BfMie3K1aHI+Kkonk9xZsYBFCz -aK3J4f+4ZHDovYvD6kYRm6NfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg9eAOH5q7MpHqNZcMYSPp -OHPd3OHlSPOG+WhW6czxaMEwCgYIKoZIzj0EAwIDRwAwRAIgayEyet/eI80iKMdw -/tHMFuq7zF3/EH80HclqBkhgw9UCIA3fkrFY0wyUI6/OUY3dLdh5PLRpmpIyj5Zc -8yt5b2Xc ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/config.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/config.yaml deleted file mode 100644 index b9e631e6f..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -NodeOUs: - Enable: true - ClientOUIdentifier: - Certificate: cacerts/ca.org2.example.com-cert.pem - OrganizationalUnitIdentifier: client - PeerOUIdentifier: - Certificate: cacerts/ca.org2.example.com-cert.pem - OrganizationalUnitIdentifier: peer diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 50445f0db..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdCgAwIBAgIQJ8c+VvDsLnFGlyyOkIqMNzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFkFkbWluQG9y -ZzIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATBjgBjOG8C -ezJ3bDkBSEHE0VUi27pNAL8C85y3pCLaG6kCHWXkmIQ4s/2jFEXuJ/1BE5e/y3H0 -X3dvBno0ROOto00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV -HSMEJDAigCD14A4fmrsykeo1lwxhI+k4c93c4eVI84b5aFbpzPFowTAKBggqhkjO -PQQDAgNIADBFAiEAtJgKgmQ3a5QlIyNO5hNVhCPGLg6siAFHB6M/J/TnYlkCIFUS -+iOOAzIHQafkBTKszTAR1Hb/jBX7PH+JbsVwRDoJ ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 37c147196..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQJ8oZo0AuGAKKIWy7eRjw4DAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Mlgbl4mNtQY4q5uPU0d262klJwhUaawoEkZVT5BfMie3K1aHI+Kkonk9xZsYBFCz -aK3J4f+4ZHDovYvD6kYRm6NfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg9eAOH5q7MpHqNZcMYSPp -OHPd3OHlSPOG+WhW6czxaMEwCgYIKoZIzj0EAwIDRwAwRAIgayEyet/eI80iKMdw -/tHMFuq7zF3/EH80HclqBkhgw9UCIA3fkrFY0wyUI6/OUY3dLdh5PLRpmpIyj5Zc -8yt5b2Xc ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/config.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/config.yaml deleted file mode 100644 index b9e631e6f..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -NodeOUs: - Enable: true - ClientOUIdentifier: - Certificate: cacerts/ca.org2.example.com-cert.pem - OrganizationalUnitIdentifier: client - PeerOUIdentifier: - Certificate: cacerts/ca.org2.example.com-cert.pem - OrganizationalUnitIdentifier: peer diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/983726350b06050b9073348da249b99bb6d57333d4a46c27b0d2062f5e8167e6_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/983726350b06050b9073348da249b99bb6d57333d4a46c27b0d2062f5e8167e6_sk deleted file mode 100644 index eff3afca2..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/983726350b06050b9073348da249b99bb6d57333d4a46c27b0d2062f5e8167e6_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgplzEY/P0vDC039nK -5khAF5hY5nw1x30hOWe8XPZSj6ShRANCAARk7OOzQc2STKTKg7xem9Ww+WpUBswA -79AFZzUWmH91n4e3K+6H6vAP5U8ir6oZYAbmMGCveqPk+TtAIjj2nqdV ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem deleted file mode 100644 index 24ed91a80..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKDCCAc+gAwIBAgIRALcqONTH0HVhPAyXncFVly0wCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBqMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzENMAsGA1UECxMEcGVlcjEfMB0GA1UEAxMWcGVlcjAub3Jn -Mi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGTs47NBzZJM -pMqDvF6b1bD5alQGzADv0AVnNRaYf3Wfh7cr7ofq8A/lTyKvqhlgBuYwYK96o+T5 -O0AiOPaep1WjTTBLMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1Ud -IwQkMCKAIPXgDh+auzKR6jWXDGEj6Thz3dzh5UjzhvloVunM8WjBMAoGCCqGSM49 -BAMCA0cAMEQCIEwtveoj4q0n8W0h7nx9sPxbfbKPxhtvI+E4kRVO8Tk3AiBnccJ3 -vkkm01nDxlwYpwxJPkR7xnb8gQbw2E5a4cBMNg== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt deleted file mode 100644 index eec41ebe4..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICZjCCAg2gAwIBAgIQG2mAM5Lf9YyBK1ODuHdCDTAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4 -NDZaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcyLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDxJF0grObx4yAKXJkNNgTLQpJapz -deaXHCVsaCDFbSiGvA7zP68/vp1lwi91Oy4JI40Me7wvzahh94OWrDQgQ6OBlzCB -lDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgnrXS9er4pLM4g7NDk1YbO+aSLkpC -zyn9rSJ4i3R5hdcwKAYDVR0RBCEwH4IWcGVlcjAub3JnMi5leGFtcGxlLmNvbYIF -cGVlcjAwCgYIKoZIzj0EAwIDRwAwRAIgBlZ3D8i/OSUZ/5ihxbUBtIlRc8v+WNdO -0K7v8/oqhl4CIDOHRuTWJxZGilhN7UN0frCTiBMR18MEcFfLsQBvMrEv ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key deleted file mode 100644 index bd4883979..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgewbUOd9IW+eoikrL -2m+l/oIKBMhfXuM3eY84AwHdL3ihRANCAAQPEkXSCs5vHjIApcmQ02BMtCklqnN1 -5pccJWxoIMVtKIa8DvM/rz++nWXCL3U7LgkjjQx7vC/NqGH3g5asNCBD ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 50445f0db..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdCgAwIBAgIQJ8c+VvDsLnFGlyyOkIqMNzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFkFkbWluQG9y -ZzIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATBjgBjOG8C -ezJ3bDkBSEHE0VUi27pNAL8C85y3pCLaG6kCHWXkmIQ4s/2jFEXuJ/1BE5e/y3H0 -X3dvBno0ROOto00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV -HSMEJDAigCD14A4fmrsykeo1lwxhI+k4c93c4eVI84b5aFbpzPFowTAKBggqhkjO -PQQDAgNIADBFAiEAtJgKgmQ3a5QlIyNO5hNVhCPGLg6siAFHB6M/J/TnYlkCIFUS -+iOOAzIHQafkBTKszTAR1Hb/jBX7PH+JbsVwRDoJ ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 37c147196..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQJ8oZo0AuGAKKIWy7eRjw4DAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Mlgbl4mNtQY4q5uPU0d262klJwhUaawoEkZVT5BfMie3K1aHI+Kkonk9xZsYBFCz -aK3J4f+4ZHDovYvD6kYRm6NfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg9eAOH5q7MpHqNZcMYSPp -OHPd3OHlSPOG+WhW6czxaMEwCgYIKoZIzj0EAwIDRwAwRAIgayEyet/eI80iKMdw -/tHMFuq7zF3/EH80HclqBkhgw9UCIA3fkrFY0wyUI6/OUY3dLdh5PLRpmpIyj5Zc -8yt5b2Xc ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/config.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/config.yaml deleted file mode 100644 index b9e631e6f..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -NodeOUs: - Enable: true - ClientOUIdentifier: - Certificate: cacerts/ca.org2.example.com-cert.pem - OrganizationalUnitIdentifier: client - PeerOUIdentifier: - Certificate: cacerts/ca.org2.example.com-cert.pem - OrganizationalUnitIdentifier: peer diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/6259fa0caff41fc0fd8a2b16e46742f8831e3411f7130444515875bcdf6297e2_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/6259fa0caff41fc0fd8a2b16e46742f8831e3411f7130444515875bcdf6297e2_sk deleted file mode 100644 index 42640aca0..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/6259fa0caff41fc0fd8a2b16e46742f8831e3411f7130444515875bcdf6297e2_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgT8Pzy7zGGm+kqeq7 -TaJAfYBv3c9G2PCSRQL8Zrh4CTqhRANCAAR+W0LxXFs+CytIp6iJ/j9rbIQMFbzk -EBc0nRdl+Sy8PVHLmUAmyPc3yobYEAnbiAZFyQgrJqoVGB0DaAGs4jmi ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem deleted file mode 100644 index 87f80147d..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKDCCAc6gAwIBAgIQB8kq9DJo4l/uQdYKv6q9dTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQLEwRwZWVyMR8wHQYDVQQDExZwZWVyMS5vcmcy -LmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfltC8VxbPgsr -SKeoif4/a2yEDBW85BAXNJ0XZfksvD1Ry5lAJsj3N8qG2BAJ24gGRckIKyaqFRgd -A2gBrOI5oqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0j -BCQwIoAg9eAOH5q7MpHqNZcMYSPpOHPd3OHlSPOG+WhW6czxaMEwCgYIKoZIzj0E -AwIDSAAwRQIhALB5hLuzt5Pvo9nsOVSWQGO9Sf9OJ/4/eCmHiQOYjtmtAiBtRbXz -n0FKtWGibSnkWIIaV0lHl0ScejXkXGEmeMzxdQ== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt deleted file mode 100644 index a2a79bef0..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICZzCCAg6gAwIBAgIRAJi2jEobBRNBJxYbEcm5VCEwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjEub3JnMi5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABD0257C74m7RqMCit7SsAc+YBVSe -Iwchf2fK37PyPtH1tTQJtR50wqeCVSxd0hlkLin8xaz7k/z77YL+w7Nc+MCjgZcw -gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJ610vXq+KSzOIOzQ5NWGzvmki5K -Qs8p/a0ieIt0eYXXMCgGA1UdEQQhMB+CFnBlZXIxLm9yZzIuZXhhbXBsZS5jb22C -BXBlZXIxMAoGCCqGSM49BAMCA0cAMEQCIEh9d+oZqnPO1nO0v8uo2SVDjAv/2tnB -6bwtnUg2g6cvAiByvhQClewv4334Q+PCDEhLZ2chlspmmVU+gQuZmWyz9w== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key deleted file mode 100644 index 9e5f241bf..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgDb4DorBzLXbrHmi4 -VecNz3y/WkW/nkh4mfc9kIuc1+qhRANCAAQ9Nuewu+Ju0ajAore0rAHPmAVUniMH -IX9nyt+z8j7R9bU0CbUedMKnglUsXdIZZC4p/MWs+5P8++2C/sOzXPjA ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/9eb5d2f5eaf8a4b33883b34393561b3be6922e4a42cf29fdad22788b747985d7_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/9eb5d2f5eaf8a4b33883b34393561b3be6922e4a42cf29fdad22788b747985d7_sk deleted file mode 100644 index 395da17ff..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/9eb5d2f5eaf8a4b33883b34393561b3be6922e4a42cf29fdad22788b747985d7_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgHZpslJa2VMDnw0nB -DCX3rvKceHXyZ37jkvls/9nX+dmhRANCAAR15bx/k3BHMSjsdrU983/b4GwW6ab5 -itbnusp8CiYkssqW0z8eoCLi5SbrAsTa/6lBeH0CyjG4SCoaPGQLAlNL ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 50445f0db..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdCgAwIBAgIQJ8c+VvDsLnFGlyyOkIqMNzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFkFkbWluQG9y -ZzIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATBjgBjOG8C -ezJ3bDkBSEHE0VUi27pNAL8C85y3pCLaG6kCHWXkmIQ4s/2jFEXuJ/1BE5e/y3H0 -X3dvBno0ROOto00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV -HSMEJDAigCD14A4fmrsykeo1lwxhI+k4c93c4eVI84b5aFbpzPFowTAKBggqhkjO -PQQDAgNIADBFAiEAtJgKgmQ3a5QlIyNO5hNVhCPGLg6siAFHB6M/J/TnYlkCIFUS -+iOOAzIHQafkBTKszTAR1Hb/jBX7PH+JbsVwRDoJ ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 37c147196..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQJ8oZo0AuGAKKIWy7eRjw4DAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Mlgbl4mNtQY4q5uPU0d262klJwhUaawoEkZVT5BfMie3K1aHI+Kkonk9xZsYBFCz -aK3J4f+4ZHDovYvD6kYRm6NfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg9eAOH5q7MpHqNZcMYSPp -OHPd3OHlSPOG+WhW6czxaMEwCgYIKoZIzj0EAwIDRwAwRAIgayEyet/eI80iKMdw -/tHMFuq7zF3/EH80HclqBkhgw9UCIA3fkrFY0wyUI6/OUY3dLdh5PLRpmpIyj5Zc -8yt5b2Xc ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/73b84d0e0bb0c31d6eb40d6054811b2c7764059e95831bb0ed160f79f3a3794e_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/73b84d0e0bb0c31d6eb40d6054811b2c7764059e95831bb0ed160f79f3a3794e_sk deleted file mode 100644 index 5617bc24c..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/73b84d0e0bb0c31d6eb40d6054811b2c7764059e95831bb0ed160f79f3a3794e_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg5b1l7UPQb5Uw5sin -kOo/BBloUfy+J+atS49UHlHEa/WhRANCAATBjgBjOG8CezJ3bDkBSEHE0VUi27pN -AL8C85y3pCLaG6kCHWXkmIQ4s/2jFEXuJ/1BE5e/y3H0X3dvBno0ROOt ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem deleted file mode 100644 index 50445f0db..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKjCCAdCgAwIBAgIQJ8c+VvDsLnFGlyyOkIqMNzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFkFkbWluQG9y -ZzIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATBjgBjOG8C -ezJ3bDkBSEHE0VUi27pNAL8C85y3pCLaG6kCHWXkmIQ4s/2jFEXuJ/1BE5e/y3H0 -X3dvBno0ROOto00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV -HSMEJDAigCD14A4fmrsykeo1lwxhI+k4c93c4eVI84b5aFbpzPFowTAKBggqhkjO -PQQDAgNIADBFAiEAtJgKgmQ3a5QlIyNO5hNVhCPGLg6siAFHB6M/J/TnYlkCIFUS -+iOOAzIHQafkBTKszTAR1Hb/jBX7PH+JbsVwRDoJ ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt deleted file mode 100644 index 52733a87b..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeGgAwIBAgIQbcjqnZoINhA91+T974jQ9zAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4 -NDZaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcyLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEaPtp0hx/a14M+sexDwpAWDXymvwb -7BGbFicRINiQG3lPj4fLANKZFaZLtYIaYKiPeHxN1th3IwM0DZn9J+7L8KNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJ610vXq+KSzOIOzQ5NWGzvmki5KQs8p -/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCrx43TIcB3T+qBYAgsfKYv/Cs9 -aGk8Zo2xyRq13xoSkgIgTERMPLJTiZW9Kx6UBN8aR0tW0WOn9MNgHwxYOb/93rs= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key deleted file mode 100644 index 956c270cd..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgLmwzfoq4Z5PVHZd9 -2Fp2QaRebnf2YTILE+n40068XumhRANCAARo+2nSHH9rXgz6x7EPCkBYNfKa/Bvs -EZsWJxEg2JAbeU+Ph8sA0pkVpku1ghpgqI94fE3W2HcjAzQNmf0n7svw ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem deleted file mode 100644 index a0aa17582..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIRAPYi/K+jwq8CjJNE0FkJd+4wCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZVc2VyMUBv -cmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECSZUMTPK -vTx8FVq7qR+Di5kY8IY9p87Cdsp8rUIqyElDgVw5gutJLzZiISeVkun0lFcjVjQX -q6gWARUEsNcPfqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAg9eAOH5q7MpHqNZcMYSPpOHPd3OHlSPOG+WhW6czxaMEwCgYIKoZI -zj0EAwIDSAAwRQIhAPKTGMT5bkdCGPRrcCLF6X7KvXGTjADyyfMo9usdJK20AiBE -KLjUchoMXKxNALgLcMI6oNQ0YiXidNS8+AbSCWnsdA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem deleted file mode 100644 index 37c147196..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICQjCCAemgAwIBAgIQJ8oZo0AuGAKKIWy7eRjw4DAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4NDZa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcyLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -Mlgbl4mNtQY4q5uPU0d262klJwhUaawoEkZVT5BfMie3K1aHI+Kkonk9xZsYBFCz -aK3J4f+4ZHDovYvD6kYRm6NfMF0wDgYDVR0PAQH/BAQDAgGmMA8GA1UdJQQIMAYG -BFUdJQAwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg9eAOH5q7MpHqNZcMYSPp -OHPd3OHlSPOG+WhW6czxaMEwCgYIKoZIzj0EAwIDRwAwRAIgayEyet/eI80iKMdw -/tHMFuq7zF3/EH80HclqBkhgw9UCIA3fkrFY0wyUI6/OUY3dLdh5PLRpmpIyj5Zc -8yt5b2Xc ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/f0cbbe6fb24330132e15fd0f56296d497f9a450341b3d39a42d1d86ba3e285c4_sk b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/f0cbbe6fb24330132e15fd0f56296d497f9a450341b3d39a42d1d86ba3e285c4_sk deleted file mode 100644 index b9ac93527..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/f0cbbe6fb24330132e15fd0f56296d497f9a450341b3d39a42d1d86ba3e285c4_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgspLTy+PxQ7CwnqvT -2oK9QQO9JO52YWzbDSj02PcIGfyhRANCAAQJJlQxM8q9PHwVWrupH4OLmRjwhj2n -zsJ2ynytQirISUOBXDmC60kvNmIhJ5WS6fSUVyNWNBerqBYBFQSw1w9+ ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem deleted file mode 100644 index a0aa17582..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICKzCCAdGgAwIBAgIRAPYi/K+jwq8CjJNE0FkJd+4wCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkzODQ2 -WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZVc2VyMUBv -cmcyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECSZUMTPK -vTx8FVq7qR+Di5kY8IY9p87Cdsp8rUIqyElDgVw5gutJLzZiISeVkun0lFcjVjQX -q6gWARUEsNcPfqNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD -VR0jBCQwIoAg9eAOH5q7MpHqNZcMYSPpOHPd3OHlSPOG+WhW6czxaMEwCgYIKoZI -zj0EAwIDSAAwRQIhAPKTGMT5bkdCGPRrcCLF6X7KvXGTjADyyfMo9usdJK20AiBE -KLjUchoMXKxNALgLcMI6oNQ0YiXidNS8+AbSCWnsdA== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt deleted file mode 100644 index 74100a444..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICSjCCAfCgAwIBAgIRAJV3Edu2L+JCz+AFkqzNA2gwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzIuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzIuZXhhbXBsZS5jb20wHhcNMTgxMTE1MDkzODQ2WhcNMjgxMTEyMDkz -ODQ2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0G -A1UEAxMWdGxzY2Eub3JnMi5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABHXlvH+TcEcxKOx2tT3zf9vgbBbppvmK1ue6ynwKJiSyypbTPx6gIuLl -JusCxNr/qUF4fQLKMbhIKho8ZAsCU0ujXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNV -HSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIJ610vXq+KSz -OIOzQ5NWGzvmki5KQs8p/a0ieIt0eYXXMAoGCCqGSM49BAMCA0gAMEUCIQCDimCN -S6j4p6zOD5tRaxaR1GUGEhfjUbPaym7VtUmm4AIgSPAiiCT7Pd1mct97WsMlPgW/ -FsgLa0kuSOzJO94QAVQ= ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt deleted file mode 100644 index 4876e6b3c..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCAeGgAwIBAgIQGSy/H4O/5lPl4rR18YGY/DAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMi5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMi5leGFtcGxlLmNvbTAeFw0xODExMTUwOTM4NDZaFw0yODExMTIwOTM4 -NDZaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcyLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0Dt6p8eAnRk+RArNFNrL0zbkb41W -MQ1/swgYJRPzGJcKwF5mQx2F4VH6cCfK6qC+vBdtDU1aTa1vUjX/GgJRBqNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJ610vXq+KSzOIOzQ5NWGzvmki5KQs8p -/a0ieIt0eYXXMAoGCCqGSM49BAMCA0cAMEQCIB2dFQRAZRxV8jpU8fWW/daRM4i5 -fG3IU2zfzIuqVih7AiBmGrovVnyZpOkm1PBh0O7ZskQQD5k9kOIONcW3z85xrw== ------END CERTIFICATE----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key b/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key deleted file mode 100644 index 39374fc89..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg4R5rVmbfpxynJqnN -giLUQkjIOMpsdYQ9TlyPLKmONgehRANCAATQO3qnx4CdGT5ECs0U2svTNuRvjVYx -DX+zCBglE/MYlwrAXmZDHYXhUfpwJ8rqoL68F20NTVpNrW9SNf8aAlEG ------END PRIVATE KEY----- diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/docker-compose-cli.yaml b/fabric-chaincode-integration-test/src/test/resources/first-network/docker-compose-cli.yaml deleted file mode 100644 index 6452f913a..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/docker-compose-cli.yaml +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -version: '2' - -volumes: - orderer.example.com: - peer0.org1.example.com: - peer1.org1.example.com: - peer0.org2.example.com: - peer1.org2.example.com: - -networks: - byfn: - -services: - - orderer.example.com: - extends: - file: base/docker-compose-base.yaml - service: orderer.example.com - container_name: orderer.example.com - networks: - - byfn - - peer0.org1.example.com: - container_name: peer0.org1.example.com - extends: - file: base/docker-compose-base.yaml - service: peer0.org1.example.com - networks: - - byfn - - peer1.org1.example.com: - container_name: peer1.org1.example.com - extends: - file: base/docker-compose-base.yaml - service: peer1.org1.example.com - networks: - - byfn - - peer0.org2.example.com: - container_name: peer0.org2.example.com - extends: - file: base/docker-compose-base.yaml - service: peer0.org2.example.com - networks: - - byfn - - peer1.org2.example.com: - container_name: peer1.org2.example.com - extends: - file: base/docker-compose-base.yaml - service: peer1.org2.example.com - networks: - - byfn - - cli: - container_name: cli - image: hyperledger/fabric-tools - tty: true - stdin_open: true - environment: - - GOPATH=/opt/gopath - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - FABRIC_LOGGING_SPEC=INFO - - CORE_PEER_ID=cli - - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_TLS_ENABLED=false - - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt - - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key - - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt - - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer - command: /bin/bash - volumes: - - /var/run/:/host/var/run/ - - ./crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - - ./channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts - - ./../../../contracts:/opt/gopath/src/github.com/hyperledger/fabric/peer/chaincodes - depends_on: - - orderer.example.com - - peer0.org1.example.com - - peer1.org1.example.com - - peer0.org2.example.com - - peer1.org2.example.com - networks: - - byfn diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/capabilities.json b/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/capabilities.json deleted file mode 100644 index 5c3f3e0e0..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/capabilities.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "mod_policy": "Admins", - "value": { - "capabilities": { - "V1_3": {} - } - }, - "version": "0" -} diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/collection_config.json b/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/collection_config.json deleted file mode 100644 index ef1971d3f..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/collection_config.json +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ - "name": "col", - "policy": "OR( OR('Org1MSP.member','Org1MSP.admin') , OR('Org2MSP.member','Org2MSP.admin') )", - "blockToLive": 100000, - "maxPeerCount": 2, - "requiredPeerCount": 2 -} -] diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/script.sh b/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/script.sh deleted file mode 100755 index dec8705de..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/script.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -echo ">> Preparing to setup Channel, and deploy chaincode" - -CHANNEL_NAME="$1" -DELAY="$2" -LANGUAGE="$3" -TIMEOUT="$4" -VERBOSE="$5" -: ${CHANNEL_NAME:="testchannel"} -: ${DELAY:="10"} -: ${LANGUAGE:="java"} -: ${TIMEOUT:="10"} -: ${VERBOSE:="false"} -LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]` -COUNTER=1 -MAX_RETRY=10 -echo "Channel name : "$CHANNEL_NAME - -# import utils -. scripts/utils.sh - -## Create channel -echo "Creating channel..." -createChannel - -## Join all the peers to the channel -echo "Having all peers join the channel..." -joinChannel - -## Set the anchor peers for each org in the channel -echo "Updating anchor peers for org1..." -updateAnchorPeers 0 1 -echo "Updating anchor peers for org2..." -updateAnchorPeers 0 2 - -## There are several chaincodes that need packaging and installing -## Currently using the old lifecyle -CC_ROOT_PATH_IN_DOCKER="/opt/gopath/src/github.com/hyperledger/fabric/peer/chaincodes" -CC_SRC_PATH="${CC_ROOT_PATH_IN_DOCKER}/fabric-shim-api" -CC_NAME="shimcc" -COLLECTIONS_CFG=$(realpath scripts/collection_config.json) - -echo "Installing chaincode on peer 0, org 1" -installChaincode 0 1 -echo "Installing chaincode on peer 0, org 2" -installChaincode 0 2 -echo "Instantiating chaincode on peer 0, org 1" -instantiateChaincode 0 1 - -# -CC_SRC_PATH="${CC_ROOT_PATH_IN_DOCKER}/fabric-ledger-api" -CC_NAME="ledgercc" -unset COLLECTIONS_CFG - -echo "Installing chaincode on peer 0, org 1" -installChaincode 0 1 -echo "Installing chaincode on peer 0, org 2" -installChaincode 0 2 -echo "Instantiating chaincode on peer 0, org 1" -instantiateChaincode 0 1 - -# -CC_SRC_PATH="${CC_ROOT_PATH_IN_DOCKER}/bare-gradle" -CC_NAME="baregradlecc" -unset COLLECTIONS_CFG - -echo "Installing chaincode on peer 0, org 1" -installChaincode 0 1 -echo "Installing chaincode on peer 0, org 2" -installChaincode 0 2 -echo "Instantiating chaincode" -instantiateChaincode 0 1 - -# -CC_SRC_PATH="${CC_ROOT_PATH_IN_DOCKER}/bare-maven" -CC_NAME="baremaven" -unset COLLECTIONS_CFG - -echo "Installing chaincode on peer 0, org 1" -installChaincode 0 1 -echo "Installing chaincode on peer 0, org 2" -installChaincode 0 2 -echo "Instantiating chaincode" -instantiateChaincode 0 1 - -# -CC_SRC_PATH="${CC_ROOT_PATH_IN_DOCKER}/wrapper-maven" -CC_NAME="wrappermaven" -unset COLLECTIONS_CFG - -echo "Installing chaincode on peer 0, org 1" -installChaincode 0 1 -echo "Installing chaincode on peer 0, org 2" -installChaincode 0 2 -echo "Instantiating chaincode" -instantiateChaincode 0 1 - -echo "<< DONE" -# exit 0 diff --git a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/utils.sh b/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/utils.sh deleted file mode 100755 index f96a0fa4e..000000000 --- a/fabric-chaincode-integration-test/src/test/resources/first-network/scripts/utils.sh +++ /dev/null @@ -1,366 +0,0 @@ -# -# Copyright IBM Corp All Rights Reserved -# -# SPDX-License-Identifier: Apache-2.0 -# - -# This is a collection of bash functions used by different scripts - -ORDERER_CA=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem -PEER0_ORG1_CA=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt -PEER0_ORG2_CA=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt -PEER0_ORG3_CA=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt - -# verify the result of the end-to-end test -verifyResult() { - if [ $1 -ne 0 ]; then - echo "!!!!!!!!!!!!!!! "$2" !!!!!!!!!!!!!!!!" - echo "========= ERROR !!! FAILED to execute End-2-End Scenario ===========" - echo - exit 1 - fi -} - -# Set OrdererOrg.Admin globals -setOrdererGlobals() { - CORE_PEER_LOCALMSPID="OrdererMSP" - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/users/Admin@example.com/msp -} - -setGlobals() { - PEER=$1 - ORG=$2 - if [ $ORG -eq 1 ]; then - CORE_PEER_LOCALMSPID="Org1MSP" - CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG1_CA - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp - if [ $PEER -eq 0 ]; then - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - else - CORE_PEER_ADDRESS=peer1.org1.example.com:7051 - fi - elif [ $ORG -eq 2 ]; then - CORE_PEER_LOCALMSPID="Org2MSP" - CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG2_CA - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp - if [ $PEER -eq 0 ]; then - CORE_PEER_ADDRESS=peer0.org2.example.com:7051 - else - CORE_PEER_ADDRESS=peer1.org2.example.com:7051 - fi - - elif [ $ORG -eq 3 ]; then - CORE_PEER_LOCALMSPID="Org3MSP" - CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG3_CA - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp - if [ $PEER -eq 0 ]; then - CORE_PEER_ADDRESS=peer0.org3.example.com:7051 - else - CORE_PEER_ADDRESS=peer1.org3.example.com:7051 - fi - else - echo "================== ERROR !!! ORG Unknown ==================" - fi - - if [ "$VERBOSE" == "true" ]; then - env | grep CORE - fi -} - -updateAnchorPeers() { - PEER=$1 - ORG=$2 - setGlobals $PEER $ORG - - if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - set -x - peer channel update -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/${CHANNEL_NAME}${CORE_PEER_LOCALMSPID}anchors.tx >&log.txt - res=$? - set +x - else - set -x - peer channel update -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/${CHANNEL_NAME}${CORE_PEER_LOCALMSPID}anchors.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA >&log.txt - res=$? - set +x - fi - cat log.txt - verifyResult $res "Anchor peer update failed" - echo "===================== Anchor peers updated for org '$CORE_PEER_LOCALMSPID' on channel '$CHANNEL_NAME' ===================== " - sleep $DELAY - echo -} - -## Sometimes Join takes time hence RETRY at least 5 times -joinChannelWithRetry() { - PEER=$1 - ORG=$2 - setGlobals $PEER $ORG - - set -x - peer channel join -b $CHANNEL_NAME.block >&log.txt - res=$? - set +x - cat log.txt - if [ $res -ne 0 -a $COUNTER -lt $MAX_RETRY ]; then - COUNTER=$(expr $COUNTER + 1) - echo "peer${PEER}.org${ORG} failed to join the channel, Retry after $DELAY seconds" - sleep $DELAY - joinChannelWithRetry $PEER $ORG - else - COUNTER=1 - fi - verifyResult $res "After $MAX_RETRY attempts, peer${PEER}.org${ORG} has failed to join channel '$CHANNEL_NAME' " -} - -installChaincode() { - PEER=$1 - ORG=$2 - setGlobals $PEER $ORG - VERSION=${3:-1.0} - set -x - peer chaincode install -n ${CC_NAME} -v ${VERSION} -l ${LANGUAGE} -p ${CC_SRC_PATH} >&log.txt - res=$? - set +x - cat log.txt - verifyResult $res "Chaincode installation on peer${PEER}.org${ORG} has failed" - echo "===================== Chaincode is installed on peer${PEER}.org${ORG} ===================== " - echo -} - -instantiateChaincode() { - PEER=$1 - ORG=$2 - setGlobals $PEER $ORG - VERSION=${3:-1.0} - - # while 'peer chaincode' command can get the orderer endpoint from the peer - # (if join was successful), let's supply it directly as we know it using - # the "-o" option - if [ -z "$COLLECTIONS_CFG" ]; then - if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - set -x - peer chaincode instantiate -o orderer.example.com:7050 -C $CHANNEL_NAME -n ${CC_NAME} -l ${LANGUAGE} -v ${VERSION} -c '{"Args":[]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" >&log.txt - res=$? - set +x - else - set -x - peer chaincode instantiate -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n javacc -l ${LANGUAGE} -v ${VERSION} -c '{"Args":[]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" >&log.txt - res=$? - set +x - fi - else - if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - set -x - peer chaincode instantiate -o orderer.example.com:7050 -C $CHANNEL_NAME -n ${CC_NAME} -l ${LANGUAGE} -v ${VERSION} -c '{"Args":[]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" --collections-config ${COLLECTIONS_CFG} >&log.txt - res=$? - set +x - else - set -x - peer chaincode instantiate -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n javacc -l ${LANGUAGE} -v ${VERSION} -c '{"Args":[]}' -P "AND ('Org1MSP.peer','Org2MSP.peer')" --collections-config ${COLLECTIONS_CFG} >&log.txt - res=$? - set +x - fi - fi - cat log.txt - verifyResult $res "Chaincode instantiation on peer${PEER}.org${ORG} on channel '$CHANNEL_NAME' failed" - sleep $DELAY - echo "===================== Chaincode is instantiated on peer${PEER}.org${ORG} on channel '$CHANNEL_NAME' ===================== " - echo -} - -upgradeChaincode() { - PEER=$1 - ORG=$2 - setGlobals $PEER $ORG - - set -x - peer chaincode upgrade -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n mycc -v 2.0 -c '{"Args":["init","a","90","b","210"]}' -P "AND ('Org1MSP.peer','Org2MSP.peer','Org3MSP.peer')" - res=$? - set +x - cat log.txt - verifyResult $res "Chaincode upgrade on peer${PEER}.org${ORG} has failed" - echo "===================== Chaincode is upgraded on peer${PEER}.org${ORG} on channel '$CHANNEL_NAME' ===================== " - echo -} - -chaincodeQuery() { - PEER=$1 - ORG=$2 - setGlobals $PEER $ORG - EXPECTED_RESULT=$3 - echo "===================== Querying on peer${PEER}.org${ORG} on channel '$CHANNEL_NAME'... ===================== " - local rc=1 - local starttime=$(date +%s) - - # continue to poll - # we either get a successful response, or reach TIMEOUT - while - test "$(($(date +%s) - starttime))" -lt "$TIMEOUT" -a $rc -ne 0 - do - sleep $DELAY - echo "Attempting to Query peer${PEER}.org${ORG} ...$(($(date +%s) - starttime)) secs" - set -x - peer chaincode query -C $CHANNEL_NAME -n mycc -c '{"Args":["query","a"]}' >&log.txt - res=$? - set +x - test $res -eq 0 && VALUE=$(cat log.txt | awk '/Query Result/ {print $NF}') - test "$VALUE" = "$EXPECTED_RESULT" && let rc=0 - # removed the string "Query Result" from peer chaincode query command - # result. as a result, have to support both options until the change - # is merged. - test $rc -ne 0 && VALUE=$(cat log.txt | egrep '^[0-9]+$') - test "$VALUE" = "$EXPECTED_RESULT" && let rc=0 - done - echo - cat log.txt - if test $rc -eq 0; then - echo "===================== Query successful on peer${PEER}.org${ORG} on channel '$CHANNEL_NAME' ===================== " - else - echo "!!!!!!!!!!!!!!! Query result on peer${PEER}.org${ORG} is INVALID !!!!!!!!!!!!!!!!" - echo "================== ERROR !!! FAILED to execute End-2-End Scenario ==================" - echo - exit 1 - fi -} - -# fetchChannelConfig -# Writes the current channel config for a given channel to a JSON file -fetchChannelConfig() { - CHANNEL=$1 - OUTPUT=$2 - - setOrdererGlobals - - echo "Fetching the most recent configuration block for the channel" - if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - set -x - peer channel fetch config config_block.pb -o orderer.example.com:7050 -c $CHANNEL --cafile $ORDERER_CA - set +x - else - set -x - peer channel fetch config config_block.pb -o orderer.example.com:7050 -c $CHANNEL --tls --cafile $ORDERER_CA - set +x - fi - - echo "Decoding config block to JSON and isolating config to ${OUTPUT}" - set -x - configtxlator proto_decode --input config_block.pb --type common.Block | jq .data.data[0].payload.data.config >"${OUTPUT}" - set +x -} - -# signConfigtxAsPeerOrg -# Set the peerOrg admin of an org and signing the config update -signConfigtxAsPeerOrg() { - PEERORG=$1 - TX=$2 - setGlobals 0 $PEERORG - set -x - peer channel signconfigtx -f "${TX}" - set +x -} - -# createConfigUpdate -# Takes an original and modified config, and produces the config update tx -# which transitions between the two -createConfigUpdate() { - CHANNEL=$1 - ORIGINAL=$2 - MODIFIED=$3 - OUTPUT=$4 - - set -x - configtxlator proto_encode --input "${ORIGINAL}" --type common.Config >original_config.pb - configtxlator proto_encode --input "${MODIFIED}" --type common.Config >modified_config.pb - configtxlator compute_update --channel_id "${CHANNEL}" --original original_config.pb --updated modified_config.pb >config_update.pb - configtxlator proto_decode --input config_update.pb --type common.ConfigUpdate >config_update.json - echo '{"payload":{"header":{"channel_header":{"channel_id":"'$CHANNEL'", "type":2}},"data":{"config_update":'$(cat config_update.json)'}}}' | jq . >config_update_in_envelope.json - configtxlator proto_encode --input config_update_in_envelope.json --type common.Envelope >"${OUTPUT}" - set +x -} - -# parsePeerConnectionParameters $@ -# Helper function that takes the parameters from a chaincode operation -# (e.g. invoke, query, instantiate) and checks for an even number of -# peers and associated org, then sets $PEER_CONN_PARMS and $PEERS -parsePeerConnectionParameters() { - # check for uneven number of peer and org parameters - if [ $(($# % 2)) -ne 0 ]; then - exit 1 - fi - - PEER_CONN_PARMS="" - PEERS="" - while [ "$#" -gt 0 ]; do - PEER="peer$1.org$2" - PEERS="$PEERS $PEER" - PEER_CONN_PARMS="$PEER_CONN_PARMS --peerAddresses $PEER.example.com:7051" - if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "true" ]; then - TLSINFO=$(eval echo "--tlsRootCertFiles \$PEER$1_ORG$2_CA") - PEER_CONN_PARMS="$PEER_CONN_PARMS $TLSINFO" - fi - # shift by two to get the next pair of peer/org parameters - shift - shift - done - # remove leading space for output - PEERS="$(echo -e "$PEERS" | sed -e 's/^[[:space:]]*//')" -} - -# chaincodeInvoke ... -# Accepts as many peer/org pairs as desired and requests endorsement from each -chaincodeInvoke() { - parsePeerConnectionParameters $@ - res=$? - verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " - - # while 'peer chaincode' command can get the orderer endpoint from the - # peer (if join was successful), let's supply it directly as we know - # it using the "-o" option - if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - set -x - peer chaincode invoke -o orderer.example.com:7050 -C $CHANNEL_NAME -n mycc $PEER_CONN_PARMS -c '{"Args":["set","a","10"]}' >&log.txt - res=$? - set +x - else - set -x - peer chaincode invoke -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n mycc $PEER_CONN_PARMS -c '{"Args":["invoke","a","b","10"]}' >&log.txt - res=$? - set +x - fi - cat log.txt - verifyResult $res "Invoke execution on $PEERS failed " - echo "===================== Invoke transaction successful on $PEERS on channel '$CHANNEL_NAME' ===================== " - echo -} - -createChannel() { - setGlobals 0 1 - - if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then - set -x - peer channel create -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/$CHANNEL_NAME.tx >&log.txt - res=$? - set +x - else - set -x - peer channel create -o orderer.example.com:7050 -c $CHANNEL_NAME -f ./channel-artifacts/$CHANNEL_NAME.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA >&log.txt - res=$? - set +x - fi - cat log.txt - verifyResult $res "Channel creation failed" - echo "===================== Channel '$CHANNEL_NAME' created ===================== " - echo -} - -joinChannel () { - for org in 1 2; do - for peer in 0 1; do - joinChannelWithRetry $peer $org - echo "===================== peer${peer}.org${org} joined channel '$CHANNEL_NAME' ===================== " - sleep $DELAY - echo - done - done -} diff --git a/fabric-chaincode-integration-test/src/test/resources/scripts/ccutils.sh b/fabric-chaincode-integration-test/src/test/resources/scripts/ccutils.sh new file mode 100644 index 000000000..d0574f009 --- /dev/null +++ b/fabric-chaincode-integration-test/src/test/resources/scripts/ccutils.sh @@ -0,0 +1,273 @@ +#!/bin/bash + +C_RESET='\033[0m' +C_RED='\033[0;31m' +C_GREEN='\033[0;32m' +C_BLUE='\033[0;34m' +C_YELLOW='\033[1;33m' + +export VERBOSE=true +export MAX_RETRY=3 +export DELAY=5 + + + +function setGlobals() { + local USING_ORG=$1 + infoln "Using organization ${USING_ORG}" + if [ $USING_ORG -eq 1 ]; then + export CORE_PEER_LOCALMSPID="org1MSP" + export CORE_PEER_MSPCONFIGPATH=${CFG}/_msp/org1/org1admin/msp + export CORE_PEER_ADDRESS=org1peer-api.127-0-0-1.nip.io:8080 + elif [ $USING_ORG -eq 2 ]; then + export CORE_PEER_LOCALMSPID="org2MSP" + export CORE_PEER_MSPCONFIGPATH=${CFG}/_msp/org2/org2admin/msp + export CORE_PEER_ADDRESS=org2peer-api.127-0-0-1.nip.io:8080 + else + errorln "ORG Unknown" + fi + + if [ "$VERBOSE" == "true" ]; then + env | grep CORE + fi +} + +# installChaincode PEER ORG +function installChaincode() { + ORG=$1 + setGlobals $ORG + set -x + peer lifecycle chaincode queryinstalled --output json | jq -r 'try (.installed_chaincodes[].package_id)' | grep ^${PACKAGE_ID}$ >&log.txt + if test $? -ne 0; then + peer lifecycle chaincode install ${CC_NAME}.tar.gz >&log.txt + res=$? + fi + { set +x; } 2>/dev/null + cat log.txt + verifyResult $res "Chaincode installation on peer0.org${ORG} has failed" + successln "Chaincode is installed on peer0.org${ORG}" +} + +# queryInstalled PEER ORG +function queryInstalled() { + ORG=$1 + setGlobals $ORG + set -x + peer lifecycle chaincode queryinstalled --output json | jq -r 'try (.installed_chaincodes[].package_id)' | grep ^${PACKAGE_ID}$ >&log.txt + res=$? + { set +x; } 2>/dev/null + cat log.txt + verifyResult $res "Query installed on peer0.org${ORG} has failed" + successln "Query installed successful on peer0.org${ORG} on channel" +} + +# approveForMyOrg VERSION PEER ORG +function approveForMyOrg() { + ORG=$1 + setGlobals $ORG + set -x + peer lifecycle chaincode approveformyorg -o orderer-api.127-0-0-1.nip.io:8080 --channelID $CHANNEL_NAME --name ${CC_NAME} ${COLLECTIONS_CFG} --version ${CC_VERSION} --package-id ${PACKAGE_ID} --sequence ${CC_SEQUENCE} >&log.txt + res=$? + { set +x; } 2>/dev/null + cat log.txt + verifyResult $res "Chaincode definition approved on peer0.org${ORG} on channel '$CHANNEL_NAME' failed" + successln "Chaincode definition approved on peer0.org${ORG} on channel '$CHANNEL_NAME'" +} + +# checkCommitReadiness VERSION PEER ORG +function checkCommitReadiness() { + ORG=$1 + shift 1 + setGlobals $ORG + infoln "Checking the commit readiness of the chaincode definition on peer0.org${ORG} on channel '$CHANNEL_NAME'..." + local rc=1 + local COUNTER=1 + # continue to poll + # we either get a successful response, or reach MAX RETRY + while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do + sleep $DELAY + infoln "Attempting to check the commit readiness of the chaincode definition on peer0.org${ORG}, Retry after $DELAY seconds." + set -x + peer lifecycle chaincode checkcommitreadiness --channelID $CHANNEL_NAME --name ${CC_NAME} --version ${CC_VERSION} ${COLLECTIONS_CFG} --sequence ${CC_SEQUENCE} --output json >&log.txt + res=$? + { set +x; } 2>/dev/null + let rc=0 + for var in "$@"; do + grep "$var" log.txt &>/dev/null || let rc=1 + done + COUNTER=$(expr $COUNTER + 1) + done + cat log.txt + if test $rc -eq 0; then + infoln "Checking the commit readiness of the chaincode definition successful on peer0.org${ORG} on channel '$CHANNEL_NAME'" + else + fatalln "After $MAX_RETRY attempts, Check commit readiness result on peer0.org${ORG} is INVALID!" + fi +} + +# commitChaincodeDefinition VERSION PEER ORG (PEER ORG)... +function commitChaincodeDefinition() { + parsePeerConnectionParameters $@ + res=$? + verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " + + # while 'peer chaincode' command can get the orderer endpoint from the + # peer (if join was successful), let's supply it directly as we know + # it using the "-o" option + set -x + peer lifecycle chaincode commit -o orderer-api.127-0-0-1.nip.io:8080 --channelID $CHANNEL_NAME --name ${CC_NAME} "${PEER_CONN_PARMS[@]}" --version ${CC_VERSION} ${COLLECTIONS_CFG} --sequence ${CC_SEQUENCE} >&log.txt + res=$? + { set +x; } 2>/dev/null + cat log.txt + verifyResult $res "Chaincode definition commit failed on peer0.org${ORG} on channel '$CHANNEL_NAME' failed" + successln "Chaincode definition committed on channel '$CHANNEL_NAME'" +} + +# queryCommitted ORG +function queryCommitted() { + ORG=$1 + setGlobals $ORG + EXPECTED_RESULT="Version: ${CC_VERSION}, Sequence: ${CC_SEQUENCE}, Endorsement Plugin: escc, Validation Plugin: vscc" + infoln "Querying chaincode definition on peer0.org${ORG} on channel '$CHANNEL_NAME'..." + local rc=1 + local COUNTER=1 + # continue to poll + # we either get a successful response, or reach MAX RETRY + while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do + sleep $DELAY + infoln "Attempting to Query committed status on peer0.org${ORG}, Retry after $DELAY seconds." + set -x + peer lifecycle chaincode querycommitted --channelID $CHANNEL_NAME --name ${CC_NAME} >&log.txt + res=$? + { set +x; } 2>/dev/null + test $res -eq 0 && VALUE=$(cat log.txt | grep -o '^Version: '$CC_VERSION', Sequence: [0-9]*, Endorsement Plugin: escc, Validation Plugin: vscc') + test "$VALUE" = "$EXPECTED_RESULT" && let rc=0 + COUNTER=$(expr $COUNTER + 1) + done + cat log.txt + if test $rc -eq 0; then + successln "Query chaincode definition successful on peer0.org${ORG} on channel '$CHANNEL_NAME'" + else + fatalln "After $MAX_RETRY attempts, Query chaincode definition result on peer0.org${ORG} is INVALID!" + fi +} + +function chaincodeInvokeInit() { + parsePeerConnectionParameters $@ + res=$? + verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " + + # while 'peer chaincode' command can get the orderer endpoint from the + # peer (if join was successful), let's supply it directly as we know + # it using the "-o" option + set -x + fcn_call='{"function":"'${CC_INIT_FCN}'","Args":[]}' + infoln "invoke fcn call:${fcn_call}" + peer chaincode invoke -o localhost:7050 --ordererTLSHostnameOverride orderer.example.com --tls --cafile "$ORDERER_CA" -C $CHANNEL_NAME -n ${CC_NAME} "${PEER_CONN_PARMS[@]}" --isInit -c ${fcn_call} >&log.txt + res=$? + { set +x; } 2>/dev/null + cat log.txt + verifyResult $res "Invoke execution on $PEERS failed " + successln "Invoke transaction successful on $PEERS on channel '$CHANNEL_NAME'" +} + +function chaincodeQuery() { + ORG=$1 + setGlobals $ORG + infoln "Querying on peer0.org${ORG} on channel '$CHANNEL_NAME'..." + local rc=1 + local COUNTER=1 + # continue to poll + # we either get a successful response, or reach MAX RETRY + while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do + sleep $DELAY + infoln "Attempting to Query peer0.org${ORG}, Retry after $DELAY seconds." + set -x + peer chaincode query -C $CHANNEL_NAME -n ${CC_NAME} -c '{"Args":["org.hyperledger.fabric:GetMetadata"]}' >&log.txt + res=$? + { set +x; } 2>/dev/null + let rc=$res + COUNTER=$(expr $COUNTER + 1) + done + cat log.txt + if test $rc -eq 0; then + successln "Query successful on peer0.org${ORG} on channel '$CHANNEL_NAME'" + else + fatalln "After $MAX_RETRY attempts, Query result on peer0.org${ORG} is INVALID!" + fi +} + + +function packageChaincode() { + set -x + peer lifecycle chaincode package ${CC_NAME}.tar.gz --path ${CC_SRC_PATH} --lang ${CC_RUNTIME_LANGUAGE} --label ${CC_NAME} >&log.txt + res=$? + PACKAGE_ID=$(peer lifecycle chaincode calculatepackageid ${CC_NAME}.tar.gz) + { set +x; } 2>/dev/null + cat log.txt + verifyResult $res "Chaincode packaging has failed" + successln "Chaincode is packaged" +} + +# println echos string +function println() { + echo -e "$1" +} + +# errorln echos i red color +function errorln() { + println "${C_RED}${1}${C_RESET}" +} + +# successln echos in green color +function successln() { + println "${C_GREEN}${1}${C_RESET}" +} + +# infoln echos in blue color +function infoln() { + println "${C_BLUE}${1}${C_RESET}" +} + +# warnln echos in yellow color +function warnln() { + println "${C_YELLOW}${1}${C_RESET}" +} + +# fatalln echos in red color and exits with fail status +function fatalln() { + errorln "$1" + exit 1 +} + +function verifyResult() { + if [ $1 -ne 0 ]; then + fatalln "$2" + fi +} + +# parsePeerConnectionParameters $@ +# Helper function that sets the peer connection parameters for a chaincode +# operation +function parsePeerConnectionParameters() { + PEER_CONN_PARMS=() + PEERS="" + while [ "$#" -gt 0 ]; do + setGlobals $1 + PEER="peer0.org$1" + ## Set peer addresses + if [ -z "$PEERS" ] + then + PEERS="$PEER" + else + PEERS="$PEERS $PEER" + fi + PEER_CONN_PARMS=("${PEER_CONN_PARMS[@]}" --peerAddresses $CORE_PEER_ADDRESS) + ## Set path to TLS certificate + CA=PEER0_ORG$1_CA + TLSINFO=(--tlsRootCertFiles "${!CA}") + PEER_CONN_PARMS=("${PEER_CONN_PARMS[@]}" "${TLSINFO[@]}") + # shift by one to get to the next organization + shift + done +} \ No newline at end of file diff --git a/fabric-chaincode-integration-test/src/test/resources/scripts/collection_config.json b/fabric-chaincode-integration-test/src/test/resources/scripts/collection_config.json new file mode 100644 index 000000000..43e5994a0 --- /dev/null +++ b/fabric-chaincode-integration-test/src/test/resources/scripts/collection_config.json @@ -0,0 +1,9 @@ +[ +{ + "name": "col", + "policy": "OR( OR('org1MSP.member','org1MSP.admin') , OR('org2MSP.member','org2MSP.admin') )", + "blockToLive": 100000, + "maxPeerCount": 1, + "requiredPeerCount": 1 +} +] diff --git a/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh b/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh new file mode 100755 index 000000000..6df1a20d4 --- /dev/null +++ b/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh @@ -0,0 +1,97 @@ +#!/bin/bash +set -x + +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )"/.. && pwd )" +export CFG="${DIR}/_cfg" +mkdir -p "${CFG}" + + +# --- +# Setup up Microfab image +# using the IBM tagged version until labs workflow is updated +docker kill microfab || true + +export MICROFAB_CONFIG='{"couchdb":false,"endorsing_organizations":[{"name":"org1"},{"name":"org2"}],"channels":[{"name":"sachannel","endorsing_organizations":["org1","org2"]}],"capability_level":"V2_0"}' + +docker run --name microfab \ + -d \ + -p 8080:8080 \ + --add-host host.docker.internal:host-gateway \ + --rm \ + -e MICROFAB_CONFIG="${MICROFAB_CONFIG}" \ + -e FABRIC_LOGGING_SPEC=info \ + ibmcom/ibp-microfab + + +sleep 10 + +curl -sSL http://console.localho.st:8080/ak/api/v1/components > $CFG/cfg.json +weft microfab -w $CFG/_wallets -p $CFG/_gateways -m $CFG/_msp -f --config $CFG/cfg.json + +# bring in the helper bash scripts +. $DIR/scripts/ccutils.sh + + +function deployCC() { +## package the chaincode +packageChaincode + +## Install chaincode on peer0.org1 and peer0.org2 +infoln "Installing chaincode on peer0.org1..." +installChaincode 1 +infoln "Install chaincode on peer0.org2..." +installChaincode 2 + +## query whether the chaincode is installed +queryInstalled 1 + +## approve the definition for org1 +approveForMyOrg 1 + +## check whether the chaincode definition is ready to be committed +## expect org1 to have approved and org2 not to +checkCommitReadiness 1 "\"org1MSP\": true" "\"org2MSP\": false" +checkCommitReadiness 2 "\"org1MSP\": true" "\"org2MSP\": false" + +## now approve also for org2 +approveForMyOrg 2 + +## check whether the chaincode definition is ready to be committed +## expect them both to have approved +checkCommitReadiness 1 "\"org1MSP\": true" "\"org2MSP\": true" +checkCommitReadiness 2 "\"org1MSP\": true" "\"org2MSP\": true" + +## now that we know for sure both orgs have approved, commit the definition +commitChaincodeDefinition 1 2 + +## query on both orgs to see that the definition committed successfully +queryCommitted 1 +queryCommitted 2 +} +#./gradlew -I ./chaincode-init.gradle -PchaincodeRepoDir=$(realpath ./fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository) publishShimPublicationToFabricRepository + +export CC_SRC_PATH="${DIR}/../../contracts/fabric-ledger-api" +export CC_NAME="ledgercc" +export CC_RUNTIME_LANGUAGE=java +export CC_VERSION=1 +export CC_SEQUENCE=1 +export CHANNEL_NAME=sachannel +export COLLECTIONS_CFG="" +deployCC + +export CC_SRC_PATH="${DIR}/../../contracts/bare-gradle" +export CC_NAME="baregradlecc" +deployCC + +export CC_SRC_PATH="${DIR}/../../contracts/bare-maven" +export CC_NAME="baremaven" +deployCC + +export CC_SRC_PATH="${DIR}/../../contracts/wrapper-maven" +export CC_NAME="wrappermaven" +deployCC + +export COLLECTIONS_CFG="--collections-config ${CFG}/../scripts/collection_config.json" +export CC_SRC_PATH="${DIR}/../../contracts/fabric-shim-api" +export CC_NAME="shimcc" +deployCC From 14a5b7705dfe2f114cf37642e2930497cc706049 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Wed, 4 Jan 2023 13:46:02 +0000 Subject: [PATCH 3/8] Update to v3.0.0. Signed-off-by: Matthew B White --- build.gradle | 2 +- examples/fabric-contract-example-gradle-kotlin/build.gradle.kts | 2 +- examples/fabric-contract-example-gradle/build.gradle | 2 +- examples/fabric-contract-example-maven/pom.xml | 2 +- fabric-chaincode-docker/build.gradle | 2 +- .../src/contracts/bare-gradle/build.gradle | 2 +- .../src/contracts/bare-maven/pom.xml | 2 +- .../src/contracts/fabric-ledger-api/build.gradle | 2 +- .../src/contracts/fabric-shim-api/build.gradle | 2 +- .../src/contracts/wrapper-maven/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 63eeab8fb..0c6cd3050 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'idea' apply plugin: 'eclipse-wtp' -version = '2.5.0' +version = '3.0.0' // If the nightly property is set, then this is the scheduled main diff --git a/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts b/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts index 667951090..6e818e94c 100644 --- a/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts +++ b/examples/fabric-contract-example-gradle-kotlin/build.gradle.kts @@ -19,7 +19,7 @@ java { dependencies { - implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.0") + implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:3.0.0") implementation("org.json:json:20180813") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") diff --git a/examples/fabric-contract-example-gradle/build.gradle b/examples/fabric-contract-example-gradle/build.gradle index 4b2f2553d..11edebc9f 100644 --- a/examples/fabric-contract-example-gradle/build.gradle +++ b/examples/fabric-contract-example-gradle/build.gradle @@ -20,7 +20,7 @@ repositories { } dependencies { - compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.5.0' + compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '3.0.0' compile group: 'org.json', name: 'json', version: '20180813' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' diff --git a/examples/fabric-contract-example-maven/pom.xml b/examples/fabric-contract-example-maven/pom.xml index e7016bc2b..a0fe1a3d0 100644 --- a/examples/fabric-contract-example-maven/pom.xml +++ b/examples/fabric-contract-example-maven/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.5.0 + 3.0.0 1.2.0 diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle index cc7c72c4c..c9c573136 100644 --- a/fabric-chaincode-docker/build.gradle +++ b/fabric-chaincode-docker/build.gradle @@ -66,6 +66,6 @@ task copyAllDeps(type: Copy) { task buildImage(type: DockerBuildImage) { dependsOn copyAllDeps inputDir = project.file('Dockerfile').parentFile - tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-2.5.0', 'hyperledger/fabric-javaenv:amd64-latest'] + tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-3.0.0', 'hyperledger/fabric-javaenv:amd64-latest'] } diff --git a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle index 097c68b35..e62e75feb 100644 --- a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.5.0' + implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '3.0.0' implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.1.3' testImplementation group: 'junit', name: 'junit', version: '4.12' implementation group: 'commons-logging', name: 'commons-logging', version: '1.2' diff --git a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml index 5cd5d4475..ab6f6f4dd 100644 --- a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml +++ b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.5.0 + 3.0.0 1.2.0 diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle index 14ebfcc85..03c676a92 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.5.0' + implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '3.0.0' testImplementation group: 'junit', name: 'junit', version: '4.12' } diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle index 097c68b35..e62e75feb 100644 --- a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle +++ b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.5.0' + implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '3.0.0' implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.1.3' testImplementation group: 'junit', name: 'junit', version: '4.12' implementation group: 'commons-logging', name: 'commons-logging', version: '1.2' diff --git a/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml index b3f68f869..878b30a4b 100644 --- a/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml +++ b/fabric-chaincode-integration-test/src/contracts/wrapper-maven/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.5.0 + 3.0.0 1.2.0 From 5c9277f02cbcb63ea3751ce99d55042f071f88d8 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Thu, 5 Jan 2023 10:24:46 +0000 Subject: [PATCH 4/8] Fixes for JAR publishing Signed-off-by: Matthew B White --- .github/workflows/build.yml | 79 ++++++++++++++++++++++++++++-- fabric-chaincode-shim/build.gradle | 8 ++- 2 files changed, 81 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cea9963f1..c61756cf9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,10 +5,16 @@ name: Fabric Chaincode and Smart Contract - Java on: push: - branches: ["**"] + branches: + - main + - release-2.5 pull_request: - branches: ["**"] - workflow_dispatch: + branches: + - main + - release-2.5 + create: + tags: + - "*" jobs: build: @@ -72,4 +78,69 @@ jobs: :fabric-chaincode-integration-test:build -xdependencyCheckAnalyze - \ No newline at end of file + + publishjars: + runs-on: ubuntu-latest + needs: [build] + if: startsWith(github.ref, 'refs/tags/') + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b + - name: Push to registry + run: | + set -xev + + ./gradlew -Psigning.key=${SIGNING_KEY} -Psigning.password=${SIGNING_PASSWORD} -PossrhUsername=${OSSRH_USER} -PossrhPassword=${OSSRH_PASSWORD} publishAllPublicationsToReleaseRepository + env: + SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}} + + + publishdocker: + runs-on: ubuntu-latest + needs: [setup,build] + if: startsWith(github.ref, 'refs/tags/') + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - uses: actions/download-artifact@v3 + with: + name: javaenv-docker-image + path: build/ + - name: Push to registry + run: | + set -xev + wget -qO "$PWD/manifest-tool" https://github.com/estesp/manifest-tool/releases/download/v1.0.0/manifest-tool-linux-amd64 + chmod +x ./manifest-tool + + # just debuging + echo ${{ needs.setup.outputs.PACKAGE_VERSION }} + echo "Version strings are ${PACKAGE_VERSION} ${MINOR_PACKAGE_VERSION}" + + docker image load --input build/fabric-javaenv.tar.gz + docker images + docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD} + echo "Logged in to docker registry" + # tag javaenv image to PACKAGE_VERSION + docker tag hyperledger/fabric-javaenv hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION} + # push javaenv to repository + docker push hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION} + ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}" --target "hyperledger/fabric-javaenv:${PACKAGE_VERSION}" + ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}" --target "hyperledger/fabric-javaenv:${MINOR_PACKAGE_VERSION}" + env: + DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} + PACAKGE_VERSION: ${{ needs.setup.outputs.PACKAGE_VERSION }} + MINOR_PACKAGE_VERSION: ${{ needs.setup.outputs.MINOR_PACKAGE_VERSION }} diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle index 73e906c05..69a0af979 100644 --- a/fabric-chaincode-shim/build.gradle +++ b/fabric-chaincode-shim/build.gradle @@ -41,7 +41,7 @@ tasks.withType(org.gradle.api.tasks.testing.Test) { } dependencies { - implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.1.3' + implementation group: 'org.hyperledger.fabric', name:'fabric-protos', version:'0.3.0' implementation 'org.bouncycastle:bcpkix-jdk15on:1.62' implementation 'org.bouncycastle:bcprov-jdk15on:1.62' implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.146' @@ -341,7 +341,11 @@ publishing { } signing { - if (project.findProperty('signing.keyId')) { + if (project.findProperty('signing.key')) { + def signingKey = findProperty("signing.key") + def signingPassword = findProperty("signing.password") + useInMemoryPgpKeys(signingKey, signingPassword) + sign publishing.publications.shim sign publishing.publications.shimJar } From c3b1f02e7a304aca89ce6782b949c260da21d840 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Thu, 9 Feb 2023 16:33:35 +0000 Subject: [PATCH 5/8] Add scheduled builds Refactor build workflows to allow reuse through workflow calls, and to make it easier to define different behaviour for different triggers. Signed-off-by: Mark S. Lewis --- .github/workflows/build.yml | 146 ----------------------------- .github/workflows/pull_request.yml | 26 +++++ .github/workflows/push.yml | 15 +++ .github/workflows/release.yml | 106 +++++++++++++++++++++ .github/workflows/schedule.yml | 21 +++++ .github/workflows/test.yml | 76 +++++++++++++++ 6 files changed, 244 insertions(+), 146 deletions(-) delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/pull_request.yml create mode 100644 .github/workflows/push.yml create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/schedule.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index c61756cf9..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright the Hyperledger Fabric contributors. All rights reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -name: Fabric Chaincode and Smart Contract - Java -on: - push: - branches: - - main - - release-2.5 - pull_request: - branches: - - main - - release-2.5 - create: - tags: - - "*" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '11' - cache: 'gradle' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b - - name: Dependency Check - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: | - :fabric-chaincode-shim:dependencyCheckAnalyze - - name: Build and Unit test - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: | - :fabric-chaincode-shim:build - -xdependencyCheckAnalyze - - intergationtest: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '11' - cache: 'gradle' - - - name: Populate chaincode with latest java-version - run: | - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository - - - - name: Ensure that the Peer/weft tools are available - run: | - curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary - npm install -g @hyperledger-labs/weft - - # set the path and cfg env var for the rest of the step - echo "FABRIC_CFG_PATH=$GITHUB_WORKSPACE/config" >> $GITHUB_ENV - echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH - - name: versions - run: | - peer version - weft --version - - name: Integration Tests - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: | - :fabric-chaincode-integration-test:build - -xdependencyCheckAnalyze - - - publishjars: - runs-on: ubuntu-latest - needs: [build] - if: startsWith(github.ref, 'refs/tags/') - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '11' - cache: 'gradle' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b - - name: Push to registry - run: | - set -xev - - ./gradlew -Psigning.key=${SIGNING_KEY} -Psigning.password=${SIGNING_PASSWORD} -PossrhUsername=${OSSRH_USER} -PossrhPassword=${OSSRH_PASSWORD} publishAllPublicationsToReleaseRepository - env: - SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} - SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} - OSSRH_USER: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}} - - - publishdocker: - runs-on: ubuntu-latest - needs: [setup,build] - if: startsWith(github.ref, 'refs/tags/') - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '11' - cache: 'gradle' - - uses: actions/download-artifact@v3 - with: - name: javaenv-docker-image - path: build/ - - name: Push to registry - run: | - set -xev - wget -qO "$PWD/manifest-tool" https://github.com/estesp/manifest-tool/releases/download/v1.0.0/manifest-tool-linux-amd64 - chmod +x ./manifest-tool - - # just debuging - echo ${{ needs.setup.outputs.PACKAGE_VERSION }} - echo "Version strings are ${PACKAGE_VERSION} ${MINOR_PACKAGE_VERSION}" - - docker image load --input build/fabric-javaenv.tar.gz - docker images - docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD} - echo "Logged in to docker registry" - # tag javaenv image to PACKAGE_VERSION - docker tag hyperledger/fabric-javaenv hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION} - # push javaenv to repository - docker push hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION} - ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}" --target "hyperledger/fabric-javaenv:${PACKAGE_VERSION}" - ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-${PACKAGE_VERSION}" --target "hyperledger/fabric-javaenv:${MINOR_PACKAGE_VERSION}" - env: - DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - PACAKGE_VERSION: ${{ needs.setup.outputs.PACKAGE_VERSION }} - MINOR_PACKAGE_VERSION: ${{ needs.setup.outputs.MINOR_PACKAGE_VERSION }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 000000000..57d5c312e --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,26 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +name: Pull request + +on: + pull_request: + branches: + - main + - release-2.5 + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + test: + uses: ./.github/workflows/test.yml + + pull-request: + needs: test + name: Pull request success + runs-on: ubuntu-latest + steps: + - run: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 000000000..d66b3033e --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,15 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +name: Push + +on: + push: + branches: + - main + - release-2.5 + workflow_dispatch: + +jobs: + test: + uses: ./.github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..65a2c37e6 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,106 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + +name: Release + +on: + create: + tags: + - '*' + workflow_dispatch: + +jobs: + test: + uses: ./.github/workflows/test.yaml + + # Publishing steps to both the Github Packages and the Sonatype + publishjars: + strategy: + fail-fast: false + matrix: + publish_target: ["publishAllPublicationsToGithubPackagesRepository","publishAllPublicationsToReleaseRepository"] + runs-on: ubuntu-latest + needs: test + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1.0.5 + - name: Push to registry ${{ matrix.publish_target }} + run: | + set -xev + ./gradlew -Psigning.key="${SIGNING_KEY}" -Psigning.password="${SIGNING_PASSWORD}" -PossrhUsername="${OSSRH_USER}" -PossrhPassword="${OSSRH_PASSWORD}" ${TARGET} + env: + SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + TARGET: ${{ matrix.publish_target }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # Publish to docker registries docker.io and ghcr.io + publishdocker: + strategy: + fail-fast: false + matrix: + DOCKER_REGISTRY: ["docker.io","ghcr.io"] + runs-on: ubuntu-latest + needs: test + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1.0.5 + - name: Build the depencies needed for the image + uses: gradle/gradle-build-action@v2.3.3 + with: + arguments: | + :fabric-chaincode-docker:copyAllDeps -x dependencyCheckAnalyze + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + buildkitd-flags: --debug + config-inline: | + [worker.oci] + max-parallelism = 1 + - name: Login to the ${{ matrix.DOCKER_REGISTRY }} Container Registry + uses: docker/login-action@v2 + with: + registry: ${{ matrix.DOCKER_REGISTRY }} + username: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_USERNAME || github.actor }} + password: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_TOKEN || secrets.GITHUB_TOKEN }} + + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ matrix.DOCKER_REGISTRY }}/${{ github.repository_owner }}/fabric-javaenv + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}}.{{minor}}.{{patch}} + - name: Build and push ${{ matrix.COMPONENT }} Image + id: push + uses: docker/build-push-action@v3 + with: + platforms: linux/amd64,linux/arm64 + file: fabric-chaincode-docker/Dockerfile + context: fabric-chaincode-docker + tags: ${{ steps.meta.outputs.tags }} + push: ${{ github.event_name != 'pull_request' }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml new file mode 100644 index 000000000..e16e89f41 --- /dev/null +++ b/.github/workflows/schedule.yml @@ -0,0 +1,21 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +name: Scheduled build + +on: + schedule: + - cron: "35 2 * * *" + workflow_dispatch: + +jobs: + main: + uses: ./.github/workflows/test.yml +# Requires a test.yml to exist in the release-2.5 branch to implement the release-2.5 specific build/test steps, since +# they are different from the main branch. +# +# release-2_5: +# name: release-2.5 +# uses: hyperledger/fabric-chaincode-java/.github/workflows/test.yml@release-2.5 +# with: +# checkout-ref: release-2.5 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..740f4d046 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,76 @@ +# Copyright the Hyperledger Fabric contributors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + +name: Test + +on: + workflow_call: + inputs: + checkout-ref: + default: '' + required: false + type: string + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ inputs.checkout-ref }} + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b + - name: Dependency Check + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: | + :fabric-chaincode-shim:dependencyCheckAnalyze + - name: Build and Unit test + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: | + :fabric-chaincode-shim:build + -xdependencyCheckAnalyze + + intergationtest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ inputs.checkout-ref }} + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: Populate chaincode with latest java-version + run: | + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository + - name: Ensure that the Peer/weft tools are available + run: | + curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary + npm install -g @hyperledger-labs/weft + + # set the path and cfg env var for the rest of the step + echo "FABRIC_CFG_PATH=$GITHUB_WORKSPACE/config" >> $GITHUB_ENV + echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH + - name: versions + run: | + peer version + weft --version + - name: Integration Tests + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: | + :fabric-chaincode-integration-test:build + -xdependencyCheckAnalyze From 192fac8172a4a9f1eabf5e45f16383b79d493de9 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Fri, 10 Feb 2023 14:31:24 +0000 Subject: [PATCH 6/8] Add Mark Lewis, remove James Taylor Signed-off-by: Matthew B White --- MAINTAINERS.md | 12 ++++++------ .../src/test/resources/scripts/mfsetup.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index fe6905654..b0c0797fc 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -2,18 +2,18 @@ Maintainers =========== -| Name | GitHub | Chat | email | -|---------------------------|------------------|---------------|---------------------------| -| Artem Barger | c0rwin | c0rwin | bartem@il.ibm.com | -| James Taylor | jt-nti | jtonline | jamest@uk.ibm.com | -| Matthew B White | mbwhite | mbwhite | whitemat@uk.ibm.com | - +| Name | GitHub | Chat | email | +|---------------------------|------------------|-----------------|---------------------------| +| Artem Barger | c0rwin | c0rwin | bartem@il.ibm.com | +| Matthew B White | mbwhite | mbwhite | whitemat@uk.ibm.com | +| Mark Lewis | bestbeforetoday | bestbeforetoday | mark_lewis@uk.ibm.com | Retired Maintainers =================== | Name | GitHub | Chat | email | |---------------------------|------------------|---------------|---------------------------| +| James Taylor | jt-nti | jtonline | jamest@uk.ibm.com | | Gari Singh | mastersingh24 | mastersingh24 | gari.r.singh@gmail.com | | Gennady Laventman | gennadylaventman | gennadyl | gennady@il.ibm.com | | Jim Zhang | jimthematrix | jimthematrix | jim\_the\_matrix@hotmail.com | diff --git a/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh b/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh index 6df1a20d4..f2cb4d8f1 100755 --- a/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh +++ b/fabric-chaincode-integration-test/src/test/resources/scripts/mfsetup.sh @@ -26,7 +26,7 @@ docker run --name microfab \ sleep 10 curl -sSL http://console.localho.st:8080/ak/api/v1/components > $CFG/cfg.json -weft microfab -w $CFG/_wallets -p $CFG/_gateways -m $CFG/_msp -f --config $CFG/cfg.json +npx @hyperledger-labs/weft microfab -w $CFG/_wallets -p $CFG/_gateways -m $CFG/_msp -f --config $CFG/cfg.json # bring in the helper bash scripts . $DIR/scripts/ccutils.sh From fa61de6df0249ee7c430b040358ff66e7e4e5d5a Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Tue, 21 Feb 2023 14:28:18 +0000 Subject: [PATCH 7/8] Enable scheduled builds for release-2.5 branch Signed-off-by: Mark S. Lewis --- .github/workflows/pull_request.yml | 1 - .github/workflows/push.yml | 1 - .github/workflows/release.yml | 16 +++++++++------- .github/workflows/schedule.yml | 14 ++++++-------- .github/workflows/test.yml | 8 ++++---- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 57d5c312e..6a9213f67 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,6 @@ on: pull_request: branches: - main - - release-2.5 workflow_dispatch: concurrency: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d66b3033e..3d2988fc5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,7 +7,6 @@ on: push: branches: - main - - release-2.5 workflow_dispatch: jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 65a2c37e6..773b87025 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,9 @@ jobs: strategy: fail-fast: false matrix: - publish_target: ["publishAllPublicationsToGithubPackagesRepository","publishAllPublicationsToReleaseRepository"] + publish_target: + - publishAllPublicationsToGithubPackagesRepository + - publishAllPublicationsToReleaseRepository runs-on: ubuntu-latest needs: test steps: @@ -30,7 +32,7 @@ jobs: java-version: '11' cache: 'gradle' - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1.0.5 + uses: gradle/wrapper-validation-action@v1 - name: Push to registry ${{ matrix.publish_target }} run: | set -xev @@ -48,7 +50,9 @@ jobs: strategy: fail-fast: false matrix: - DOCKER_REGISTRY: ["docker.io","ghcr.io"] + DOCKER_REGISTRY: + - 'docker.io' + - 'ghcr.io' runs-on: ubuntu-latest needs: test permissions: @@ -62,15 +66,14 @@ jobs: java-version: '11' cache: 'gradle' - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1.0.5 + uses: gradle/wrapper-validation-action@v1 - name: Build the depencies needed for the image - uses: gradle/gradle-build-action@v2.3.3 + uses: gradle/gradle-build-action@v2 with: arguments: | :fabric-chaincode-docker:copyAllDeps -x dependencyCheckAnalyze - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: @@ -84,7 +87,6 @@ jobs: registry: ${{ matrix.DOCKER_REGISTRY }} username: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_USERNAME || github.actor }} password: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_TOKEN || secrets.GITHUB_TOKEN }} - - name: Docker meta id: meta uses: docker/metadata-action@v4 diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index e16e89f41..23740483c 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -11,11 +11,9 @@ on: jobs: main: uses: ./.github/workflows/test.yml -# Requires a test.yml to exist in the release-2.5 branch to implement the release-2.5 specific build/test steps, since -# they are different from the main branch. -# -# release-2_5: -# name: release-2.5 -# uses: hyperledger/fabric-chaincode-java/.github/workflows/test.yml@release-2.5 -# with: -# checkout-ref: release-2.5 + + release-2_5: + name: release-2.5 + uses: hyperledger/fabric-chaincode-java/.github/workflows/test.yml@release-2.5 + with: + checkout-ref: release-2.5 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 740f4d046..c8bcad79c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,14 +25,14 @@ jobs: java-version: '11' cache: 'gradle' - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b + uses: gradle/wrapper-validation-action@v1 - name: Dependency Check - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + uses: gradle/gradle-build-action@v2 with: arguments: | :fabric-chaincode-shim:dependencyCheckAnalyze - name: Build and Unit test - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + uses: gradle/gradle-build-action@v2 with: arguments: | :fabric-chaincode-shim:build @@ -69,7 +69,7 @@ jobs: peer version weft --version - name: Integration Tests - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + uses: gradle/gradle-build-action@v2 with: arguments: | :fabric-chaincode-integration-test:build From d3ac597883f3e26297316fab305809e58dc42d92 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Tue, 21 Feb 2023 14:24:14 +0000 Subject: [PATCH 8/8] Updated to match the release-2.5 gradle file Signed-off-by: Matthew B White --- .github/workflows/test.yml | 10 +++--- fabric-chaincode-shim/build.gradle | 56 +++++++++--------------------- 2 files changed, 21 insertions(+), 45 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 740f4d046..bdcc8d75c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,11 +51,11 @@ jobs: cache: 'gradle' - name: Populate chaincode with latest java-version run: | - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository - ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimPublicationToFabricRepository + ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimPublicationToFabricRepository - name: Ensure that the Peer/weft tools are available run: | curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle index 69a0af979..f6a97fe84 100644 --- a/fabric-chaincode-shim/build.gradle +++ b/fabric-chaincode-shim/build.gradle @@ -290,67 +290,43 @@ publishing { } } - shimJar(MavenPublication) { - from components.java - artifactId 'fabric-chaincode-shim' - pom.withXml { - def repository = asNode() - .appendNode('repositories') - .appendNode('repository'); - repository.appendNode('id', 'jitpack.io') - repository.appendNode('url', 'https://jitpack.io') - } - } } repositories { maven { name = "release" - if (nightly) { - url = "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven" - credentials { - username = project.findProperty('artifactoryUsername') - password = project.findProperty('artifactoryPassword') - } - } else { - url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" - credentials { - username = project.findProperty('ossrhUsername') - password = project.findProperty('ossrhPassword') - } + url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + credentials { + username = project.findProperty('ossrhUsername') + password = project.findProperty('ossrhPassword') } + } maven { - name = "snapshot" - if (nightly) { - url = "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven" - credentials { - username = project.findProperty('artifactoryUsername') - password = project.findProperty('artifactoryPassword') - } - } else { - url = "https://oss.sonatype.org/content/repositories/snapshots/" - credentials { - username = project.findProperty('ossrhUsername') - password = project.findProperty('ossrhPassword') - } + name = "GitHubPackages" + url = "https://maven.pkg.github.com/hyperledger/fabric-chaincode-java" + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") } } } } signing { + println "Signing" if (project.findProperty('signing.key')) { - def signingKey = findProperty("signing.key") - def signingPassword = findProperty("signing.password") + def signingKey = project.findProperty('signing.key') + def signingPassword = project.findProperty('signing.password') useInMemoryPgpKeys(signingKey, signingPassword) sign publishing.publications.shim - sign publishing.publications.shimJar + println "... signed" + } else { + println "... no keys to use " } } - // Need to specify the sourcesJar task BEFORE the java{withSourcesJar()} so that it picks up the duplicatesStratergy // otherwise this fails with a duplicates error. // (see https://github.com/gradle/gradle/issues/17236)