fix: revert all unrelevant changes

hyperledger-labs · Dec 6, 2024 · 8f21aaf · 8f21aaf
1 parent eae6380
commit 8f21aaf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/ccapi/config/configsdk-org1.yaml b/ccapi/config/configsdk-org1.yaml
@@ -32,7 +32,7 @@ client:
 
   tlsCerts:
     # [Optional]. Use system certificate pool when connecting to peers, orderers (for negotiating TLS) Default: false
-    systemCertPool: false
+    systemCertPool: true
     # [Optional]. Client key and cert for TLS handshake with peers and orderers
     client:
       # 使用byfn中Admin@org1的证书

diff --git a/ccapi/config/configsdk-org2.yaml b/ccapi/config/configsdk-org2.yaml
@@ -32,7 +32,7 @@ client:
 
   tlsCerts:
     # [Optional]. Use system certificate pool when connecting to peers, orderers (for negotiating TLS) Default: false
-    systemCertPool: false
+    systemCertPool: true
     # [Optional]. Client key and cert for TLS handshake with peers and orderers
     client:
       # 使用byfn中Admin@org2的证书
@@ -49,7 +49,7 @@ client:
 #
 channels:
   # name of the channel
-  mychannel:
+  mainchannel:
     # Required. list of orderers designated by the application to use for transactions on this
     # channel. This list can be a result of access control ("org2" can only access "ordererA"), or
     # operational decisions to share loads from applications among the orderers.  The values must

diff --git a/ccapi/docker-compose-1org.yaml b/ccapi/docker-compose-1org.yaml
@@ -13,7 +13,7 @@ services:
       - 80:80
     volumes:
       - ./:/rest-server
-      - ../fabric-private-chaincode/samples/deployment/test-network/fabric-samples/test-network/organizations:/fabric/organizations
+      - ../fabric/organizations:/fabric/organizations
     logging:
       options:
         max-size: 50m  

diff --git a/ccapi/web-client/docker-compose-goinitus.yaml b/ccapi/web-client/docker-compose-goinitus.yaml
@@ -1,7 +1,7 @@
 version: '3'
 
 networks:
-  fabric_test:
+  cc-tools-demo-net:
     external: true
 
 services:
@@ -11,4 +11,4 @@ services:
     ports:
       - "8080:80"
     networks:
-      - fabric_test
+      - cc-tools-demo-net
diff --git a/fabric/addOrg3/docker/docker-compose-ca-org3.yaml b/fabric/addOrg3/docker/docker-compose-ca-org3.yaml
@@ -18,5 +18,5 @@ services:
       - "11054:11054"
     command: sh -c 'fabric-ca-server start -b admin:adminpw -d'
     volumes:
-      - /src/github.com/hyperledger/fabric-private-chaincode/samples/deployment/test-network/fabric-samples/test-network/addOrg3/fabric-ca/org3:/etc/hyperledger/fabric-ca-server
+      - ../fabric-ca/org3:/etc/hyperledger/fabric-ca-server
     container_name: ca_org3
diff --git a/fabric/scripts/ccutils.sh b/fabric/scripts/ccutils.sh
@@ -195,7 +195,7 @@ startDockerContainer() {
       ${CONTAINER_CLI} run -d --name ${CC_NAME}.org1.example.com \
                     --network cc-tools-demo-net \
                     -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:9999 \
-                    -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                    -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                     -e RUN_CCAAS=true -e TLS_ENABLED=$CCAAS_TLS_ENABLED \
                     -e KEY_PATH=certs/server/key.pem -e CERT_PATH=certs/server/cert.pem \
                     -e CA_CERT_PATH=certs/ca/cert.pem \
@@ -210,7 +210,7 @@ startDockerContainer() {
       ${CONTAINER_CLI} run -d --name ${CC_NAME}.org2.example.com \
                     --network cc-tools-demo-net \
                     -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:9998 \
-                    -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                    -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                     -e RUN_CCAAS=true -e TLS_ENABLED=$CCAAS_TLS_ENABLED \
                     -e KEY_PATH=certs/server/key.pem -e CERT_PATH=certs/server/cert.pem \
                     -e CA_CERT_PATH=certs/ca/cert.pem \
@@ -225,7 +225,7 @@ startDockerContainer() {
       ${CONTAINER_CLI} run -d --name ${CC_NAME}.org3.example.com \
                     --network cc-tools-demo-net \
                     -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:9997 \
-                    -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                    -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                     -e RUN_CCAAS=true -e TLS_ENABLED=$CCAAS_TLS_ENABLED \
                     -e KEY_PATH=certs/server/key.pem -e CERT_PATH=certs/server/cert.pem \
                     -e CA_CERT_PATH=certs/ca/cert.pem \
@@ -241,7 +241,7 @@ startDockerContainer() {
       ${CONTAINER_CLI} run -d --name ${CC_NAME}.org.example.com \
                     --network cc-tools-demo-net \
                     -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:${CCAAS_SERVER_PORT} \
-                    -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                    -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                     -e RUN_CCAAS=true -e TLS_ENABLED=$CCAAS_TLS_ENABLED \
                     -e KEY_PATH=certs/server/key.pem -e CERT_PATH=certs/server/cert.pem \
                     -e CA_CERT_PATH=certs/ca/cert.pem \
@@ -260,27 +260,27 @@ startDockerContainer() {
       infoln "    ${CONTAINER_CLI} run --rm -d --name peer0.org1_${CC_NAME}_ccaas  \
                   --network cc-tools-demo-net \
                   -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:${CCAAS_SERVER_PORT} \
-                  -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                  -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                   -e RUN_CCAAS=true \
                     ${CC_NAME}_ccaas_image:latest"
       infoln "    ${CONTAINER_CLI} run --rm -d --name peer0.org2_${CC_NAME}_ccaas  \
                     --network cc-tools-demo-net \
                     -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:${CCAAS_SERVER_PORT} \
-                    -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                    -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                     -e RUN_CCAAS=true \
                       ${CC_NAME}_ccaas_image:latest"
 
       infoln "    ${CONTAINER_CLI} run --rm -d --name peer0.org3_${CC_NAME}_ccaas  \
                     --network cc-tools-demo-net \
                     -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:${CCAAS_SERVER_PORT} \
-                    -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                    -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                     -e RUN_CCAAS=true \
                       ${CC_NAME}_ccaas_image:latest"
     else
       infoln "    ${CONTAINER_CLI} run --rm -d --name peer0.org_${CC_NAME}_ccaas  \
                     --network cc-tools-demo-net \
                     -e CHAINCODE_SERVER_ADDRESS=0.0.0.0:${CCAAS_SERVER_PORT} \
-                    -e CHAINCODE_PKG_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
+                    -e CHAINCODE_ID=$PACKAGE_ID -e CORE_CHAINCODE_ID_NAME=$PACKAGE_ID \
                     -e RUN_CCAAS=true \
                       ${CC_NAME}_ccaas_image:latest"
     fi