From 9974c4b4135d5d1656993f299abe541078a9a9b5 Mon Sep 17 00:00:00 2001 From: VRamakrishna Date: Mon, 11 Sep 2023 13:36:08 +0000 Subject: [PATCH] build(weaver-testnet): refactored script and reverted dependency version change Minor refactoring in Fabric testnet launch script. Reverting unnecessary version downgrade in Weaver relay Cargo dependencies. Signed-off-by: VRamakrishna --- weaver/core/relay/Cargo.lock | 4 ++-- weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/weaver/core/relay/Cargo.lock b/weaver/core/relay/Cargo.lock index 13b16b62ef..a74a0eed66 100644 --- a/weaver/core/relay/Cargo.lock +++ b/weaver/core/relay/Cargo.lock @@ -1810,9 +1810,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", diff --git a/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh b/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh index 0fc929fdcc..82f8130b5b 100755 --- a/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh +++ b/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh @@ -1,6 +1,6 @@ directory=$(dirname $0) -CACTI_VERSION=v2@v2.0.0-alpha.1 +CACTI_VERSION=v2.0.0-alpha.1 TMP_PATH=$PWD/../shared/tmp CHAINCODE_PATH=$PWD/../shared/chaincode rm -rf $CHAINCODE_PATH/interop @@ -15,7 +15,7 @@ export GOPATH=$TMP_PATH # Download interopcc and copy it into correct folder go install "${INTEROPCC_MOD}@latest" -cp -r $TMP_PATH/pkg/mod/github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/contracts/interop/$CACTI_VERSION $CHAINCODE_PATH/interop +cp -r $TMP_PATH/pkg/mod/$INTEROPCC_MOD@$CACTI_VERSION $CHAINCODE_PATH/interop chmod -R +w $CHAINCODE_PATH/interop # Clean tmp and Undo gopath