refactor: update modules and links to hyperledger/cacti/weaver

Refactoring weaver directory so that the build works: - All go modules name corrected from hyperledger-labs/weaver-dlt-interoperability to hyperledger/cacti. - All hyperlinks to github.com/hyperledger-labs/weaver-dlt-interoperability corrected to github.com/hyperledger/cacti/weaver - Enabled Weaver Testing workflows, with refactoring so that it works in cacti. - Added samples files from weaver, missed during merge. Update from hyperledger-labs/weaver-dlt-interopability repository: - Fix NodeSDK GetSubscriptionState Bug - Fix Interopcc DeleteMembership: allow network-admin to delete memberships - Refactor log messages from fabric driver - Fix Corda Interop App's HashMechanism protobuf bug. Chore: - Update my name (sanvenDev -> sandeepnRES) - Added corda generated files, and corda serializationwhitelist code in .dcilintignore. - Delete all Jenkinsfile that are not required anymore. - Added dark mode logo for Cacti (Resolving conflict from PR hyperledger-cacti#2295) Also: enabled weaver test workflows refactor(name): update sandeep name chore: add files (with whitelist keyword) that can't be modified to dcilintignore chore: delete all legacy Jenkinsfile chore: add clsx to cspell words; update prettier in driver, sdk and cli fix(interopcc): allow network-admin to delete membership chore: added dark mode Cacti logo refactor(driver): change logger, and using debug logs for sensitive data fix: interop-cordapp bug with hash mechanism protobuf fix: driver logging and iin-agent makefile Signed-off-by: Sandeep Nishad <[email protected]> Signed-off-by: Peter Somogyvari <[email protected]>
sandeepnRES · Mar 14, 2023 · 4eb756e · 4eb756e
1 parent 6335787
commit 4eb756e
Show file tree

Hide file tree

Showing 262 changed files with 1,447 additions and 1,389 deletions.
diff --git a/.dcilintignore b/.dcilintignore
@@ -19,24 +19,10 @@ packages/cactus-test-tooling/src/main/typescript/keycloak/keycloak-container.ts
 # Generated code that cannot be modified
 examples/cactus-example-carbon-accounting-backend/src/main/json/generated/build-info/**
 
-# Corda test network files that are generated and therefore cannot be altered to comply with DCI-Lint
+# Cannot be edited as its a name of a imported Corda library, and Corda syntax
 weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/network-parameters
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.mv.db
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.mv.db
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.mv.db
-weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.mv.db
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.mv.db
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.mv.db
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.mv.db
-weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.mv.db
 weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/CustomSerializationWhitelist.kt
-weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/AccessControlFlows.kt
 weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/com/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt
+
+# Corda test network files that are generated and therefore cannot be altered to comply with DCI-Lint
+weaver/tests/network-setups/corda/shared
diff --git a/...ub/workflows/test_asset-exchange-besu.yml → ...flows/test_weaver-asset-exchange-besu.yml b/...ub/workflows/test_asset-exchange-besu.yml → ...flows/test_weaver-asset-exchange-besu.yml
@@ -17,6 +17,7 @@ on:
 jobs:
 
   asset-exchange-besu:
+    if: ${{ false }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -36,6 +37,11 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
 
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14.x
+
       - name: Use Protoc 3.15
         run: |
           curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
@@ -46,7 +52,7 @@ jobs:
         run: |
           export PATH="$PATH:${GITHUB_WORKSPACE}/protoc/bin"
           make build
-        working-directory: common/protos-sol
+        working-directory: weaver/common/protos-sol
 
       # BESU NETWORK
       - name: Start Besu Network
@@ -60,21 +66,21 @@ jobs:
           export PATH="${PWD}/ethsigner-22.1.3/bin:$PATH"
           make start
           sleep 100
-        working-directory: tests/network-setups/besu
+        working-directory: weaver/tests/network-setups/besu
 
       # Deploy contracts
       - name: Deploy contracts
         run: |
          make deploy-contracts
-        working-directory: samples/besu/simpleasset
+        working-directory: weaver/samples/besu/simpleasset
 
        # BESU CLI
       - name: Setup BESU CLI .npmrc
         run: |
          cp .npmrc.template .npmrc
          sed -i "s/<personal-access-token>/${{ secrets.GITHUB_TOKEN }}/g" .npmrc
          cat .npmrc
-        working-directory: samples/besu/besu-cli
+        working-directory: weaver/samples/besu/besu-cli
 
       - name: Setup BESU CLI init
         run: |
@@ -85,7 +91,7 @@ jobs:
          cp config.json tmp.json
          jq -r '.network2.tokenContract |= "../simpleasset/build/contracts/BobERC20.json"' tmp.json > config.json
          rm tmp.json
-        working-directory: samples/besu/besu-cli
+        working-directory: weaver/samples/besu/besu-cli
 
       - name: Asset Exchange Besu CLI Tests
         run: |
@@ -188,7 +194,7 @@ jobs:
           else
               exit 1
           fi
-        working-directory: samples/besu/besu-cli
+        working-directory: weaver/samples/besu/besu-cli
 
   asset-exchange-besu-local:
     # The type of runner that the job will run on
@@ -210,6 +216,11 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
 
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14.x
+
       - name: Use Protoc 3.15
         run: |
           curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
@@ -220,21 +231,19 @@ jobs:
         run: |
           export PATH="$PATH:${GITHUB_WORKSPACE}/protoc/bin"
           make build
-        working-directory: common/protos-js
+        working-directory: weaver/common/protos-js
 
       # PROTOS
       - name: Build Solidity Protos
         run: |
           export PATH="$PATH:${GITHUB_WORKSPACE}/protoc/bin"
           make build
-        working-directory: common/protos-sol
+        working-directory: weaver/common/protos-sol
 
       # BESU SDK
       - name: Setup BESU SDK
-        run: |
-         npm link
-         make build-local
-        working-directory: sdks/besu/interoperation-node-sdk 
+        run: make build-local
+        working-directory: weaver/sdks/besu/interoperation-node-sdk 
 
       # BESU NETWORK
       - name: Start Besu Network
@@ -248,13 +257,13 @@ jobs:
           export PATH="${PWD}/ethsigner-22.1.3/bin:$PATH"
           make start
           sleep 100
-        working-directory: tests/network-setups/besu
+        working-directory: weaver/tests/network-setups/besu
 
       # Deploy contracts
       - name: Deploy contracts
         run: |
          make deploy-contracts
-        working-directory: samples/besu/simpleasset
+        working-directory: weaver/samples/besu/simpleasset
 
        # BESU CLI
       - name: Setup BESU CLI init
@@ -266,7 +275,7 @@ jobs:
          cp config.json tmp.json
          jq -r '.network2.tokenContract |= "../simpleasset/build/contracts/BobERC20.json"' tmp.json > config.json
          rm tmp.json
-        working-directory: samples/besu/besu-cli  
+        working-directory: weaver/samples/besu/besu-cli  
 
       - name: Asset Exchange Besu CLI Tests
         run: |
@@ -369,5 +378,5 @@ jobs:
           else
               exit 1
           fi
-        working-directory: samples/besu/besu-cli
+        working-directory: weaver/samples/besu/besu-cli
 
diff --git a/...b/workflows/test_asset-exchange-corda.yml → ...lows/test_weaver-asset-exchange-corda.yml b/...b/workflows/test_asset-exchange-corda.yml → ...lows/test_weaver-asset-exchange-corda.yml
@@ -21,6 +21,7 @@ on:
 jobs:
 
   asset-exchange-corda:
+    if: ${{ false }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -51,7 +52,7 @@ jobs:
           ./scripts/get-cordapps.sh || mv github.main.properties github.properties
           
           cat github.properties
-        working-directory: tests/network-setups/corda
+        working-directory: weaver/tests/network-setups/corda
 
       # CORDA NETWORK
       - name: Start Corda Network
@@ -60,12 +61,12 @@ jobs:
           sleep 100
           docker logs corda_partya_1
           docker logs corda_partyb_1
-        working-directory: tests/network-setups/corda
+        working-directory: weaver/tests/network-setups/corda
 
       # FABRIC CLI
       - name: Setup Corda CLI init
         run: ./scripts/initAsset.sh 1
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application
 
       - name: Asset Exchange Corda CLI Tests
         run: |
@@ -113,7 +114,7 @@ jobs:
           else
               exit 1
           fi
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application
 
   asset-exchange-corda-local:
     # The type of runner that the job will run on
@@ -132,20 +133,20 @@ jobs:
 
       - name: Build Java Protos
         run: make build
-        working-directory: common/protos-java-kt
+        working-directory: weaver/common/protos-java-kt
 
       # Build Dependencies        
       - name: Build Corda Interop App
         run: make build-local
-        working-directory: core/network/corda-interop-app
+        working-directory: weaver/core/network/corda-interop-app
 
       - name: Build Corda Interop SDK
         run: make build
-        working-directory: sdks/corda
+        working-directory: weaver/sdks/corda
 
       - name: Build Corda SimpleApplication
         run: make build-local
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application
 
       # CORDA NETWORK
       - name: Start Corda Network
@@ -154,12 +155,12 @@ jobs:
           sleep 100
           docker logs corda_partya_1
           docker logs corda_partyb_1
-        working-directory: tests/network-setups/corda
+        working-directory: weaver/tests/network-setups/corda
 
       # FABRIC CLI
       - name: Setup Corda CLI init
         run: ./scripts/initAsset.sh 1
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application
 
       - name: Asset Exchange Corda CLI Tests
         run: |
@@ -207,7 +208,7 @@ jobs:
           else
               exit 1
           fi
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application
 
   house-token-exchange-corda:
     # The type of runner that the job will run on
@@ -240,7 +241,7 @@ jobs:
           ./scripts/get-cordapps.sh || mv github.main.properties github.properties
           
           cat github.properties
-        working-directory: tests/network-setups/corda
+        working-directory: weaver/tests/network-setups/corda
 
       # CORDA NETWORK
       - name: Start Corda Network
@@ -250,18 +251,18 @@ jobs:
           docker logs corda_partya_1
           docker logs corda_partyb_1
           docker logs corda_partyc_1
-        working-directory: tests/network-setups/corda
+        working-directory: weaver/tests/network-setups/corda
 
       # CORDA CLI
       - name: Build CLI
         run: |
             cp ../../../tests/network-setups/corda/github.properties .
             make build-cli
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application
 
       - name: Setup Corda CLI init
         run: ./scripts/initHouseToken.sh 1
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application
 
       - name: House Token Exchange Corda CLI Tests
         run: |
@@ -309,4 +310,4 @@ jobs:
           else
               exit 1
           fi
-        working-directory: samples/corda/corda-simple-application
+        working-directory: weaver/samples/corda/corda-simple-application