Run FSAT tests with 2.5 images, binaries, and trigger on all builds f…

…or regression coverage (#919) Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
hyperledger · Jan 27, 2023 · c986c8d · c986c8d
1 parent 5bc925a
commit c986c8d
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 316 deletions.
diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml
@@ -10,6 +10,12 @@ inputs:
   k9s-version:
     description: k9s Version
     default: v0.25.3
+  fabric-version:
+    description: Version of Hyperledger Fabric
+    default: 2.5.0-alpha3
+  ca-version:
+    description: Version of Hyperledger Fabric CA
+    default: 1.5.6-beta3
 
 runs:
   using: "composite"
@@ -42,5 +48,6 @@ runs:
       shell: bash
       working-directory: full-stack-asset-transfer-guide
       run: |
-        curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary
+        curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \
+          | bash -s -- binary --fabric-version ${{ inputs.fabric-version }} --ca-version ${{ inputs.ca-version }}
         echo ${PWD}/bin >> $GITHUB_PATH
diff --git a/.github/workflows/test-fsat.yaml b/.github/workflows/test-fsat.yaml
@@ -7,8 +7,6 @@ on:
     branches:
       - "main"
       - "release-2.5"
-    paths:
-      - "full-stack-asset-transfer-guide/**"
 
 jobs:
   ansible:

diff --git a/asset-transfer-sbe/chaincode-java/build.gradle b/asset-transfer-sbe/chaincode-java/build.gradle
@@ -14,13 +14,13 @@ version '1.0-SNAPSHOT'
 
 dependencies {
 
-    implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+'
+    implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1'
     implementation 'org.json:json:+'
     implementation 'com.google.protobuf:protobuf-java:3.+'
-    implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-protos:2.+'
+    implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-protos:2.4.1'
     implementation 'com.owlike:genson:1.5'
 
-    testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+'
+    testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.11.1'
     testImplementation 'org.mockito:mockito-core:2.+'

diff --git a/asset-transfer-sbe/chaincode-typescript/package.json b/asset-transfer-sbe/chaincode-typescript/package.json
@@ -21,8 +21,9 @@
   "author": "Hyperledger",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-contract-api": "^2.5.0",
-    "fabric-shim": "^2.5.0"
+    "@grpc/grpc-js": "1.8.1",
+    "fabric-contract-api": "~2.5.2",
+    "fabric-shim": "~2.5.2"
   },
   "devDependencies": {
     "@types/chai": "^4.2.11",

diff --git a/full-stack-asset-transfer-guide/.github/workflows/asset-tx-typescript-contract-image.yaml b/full-stack-asset-transfer-guide/.github/workflows/asset-tx-typescript-contract-image.yaml
diff --git a/full-stack-asset-transfer-guide/.github/workflows/docker-build.yaml b/full-stack-asset-transfer-guide/.github/workflows/docker-build.yaml
diff --git a/full-stack-asset-transfer-guide/.github/workflows/test-ansible.yaml b/full-stack-asset-transfer-guide/.github/workflows/test-ansible.yaml
diff --git a/full-stack-asset-transfer-guide/.github/workflows/test-chaincode.yaml b/full-stack-asset-transfer-guide/.github/workflows/test-chaincode.yaml
diff --git a/full-stack-asset-transfer-guide/.github/workflows/test-cloud.yaml b/full-stack-asset-transfer-guide/.github/workflows/test-cloud.yaml
diff --git a/full-stack-asset-transfer-guide/.github/workflows/test-console.yaml b/full-stack-asset-transfer-guide/.github/workflows/test-console.yaml
diff --git a/full-stack-asset-transfer-guide/applications/trader-typescript/src/contract.ts b/full-stack-asset-transfer-guide/applications/trader-typescript/src/contract.ts
@@ -76,8 +76,10 @@ export class AssetTransfer {
     }
 
     async transferAsset(id: string, newOwner: string, newOwnerOrg: string): Promise<void> {
-        // TODO: Implement me!
-        // Submit a 'TransferAsset' transaction, which requires [id, newOwner, newOwnerOrg] arguments.
+        console.log(`transferring asset '${id}' to ${newOwner}, ${newOwnerOrg}`);
+        // TODO: implement the transferAsset() function.
+        // TODO: submit a 'TransferAsset' transaction, requiring [id, newOwner, newOwnerOrg] arguments.
+        return Promise.reject(new Error('TODO: implement the contract.ts transferAsset() function.'));
     }
 }
 

diff --git a/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/package.json b/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/package.json
@@ -26,8 +26,8 @@
     "author": "Hyperledger",
     "license": "Apache-2.0",
     "dependencies": {
-        "fabric-contract-api": "^2.4.0",
-        "fabric-shim": "^2.4.0",
+        "fabric-contract-api": "~2.5.2",
+        "fabric-shim": "~2.5.2",
         "json-stringify-deterministic": "^1.0.7",
         "sort-keys-recursive": "^2.1.7"
     },