From 208067eecfe51ee1802c720bbfbe968b43a2ba37 Mon Sep 17 00:00:00 2001
From: Pavel <Pavel.Murygin@gmail.com>
Date: Mon, 28 Nov 2022 13:59:07 +0300
Subject: [PATCH] Fix failing tests in AquaVM (#207)

---
 .github/workflows/snapshot.yml                  |  5 +++++
 .github/workflows/tests.yml                     |  5 +++++
 packages/fluence-js/package.json                |  2 +-
 .../src/__test__/integration/avm.spec.ts        | 17 +++++++++++++----
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 5aa0ddda..56c1524f 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -9,6 +9,10 @@ on:
       marine-js-version:
         description: "@fluencelabs/marine-js version"
         type: string
+      ref:
+        description: "git ref to checkout to"
+        type: string
+        default: "master"
     outputs:
       fluence-js-version:
         description: "@fluencelabs/fluence version"
@@ -35,6 +39,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: fluencelabs/fluence-js
+          ref: ${{ inputs.ref }}
 
       - uses: pnpm/action-setup@v2.2.4
         with:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cf2514cc..a33f8a7a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,6 +13,10 @@ on:
       marine-js-version:
         description: "@fluencelabs/marine-js version"
         type: string
+      ref:
+        description: "git ref to checkout to"
+        type: string
+        default: "master"
 
 env:
   RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}"
@@ -59,6 +63,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: fluencelabs/fluence-js
+          ref: ${{ inputs.ref }}
 
       - name: Pull rust-peer image
         run: docker pull $RUST_PEER_IMAGE
diff --git a/packages/fluence-js/package.json b/packages/fluence-js/package.json
index 0cac9cc5..71fc2c90 100644
--- a/packages/fluence-js/package.json
+++ b/packages/fluence-js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fluencelabs/fluence",
-    "version": "0.27.1",
+    "version": "0.27.2",
     "description": "TypeScript implementation of Fluence Peer",
     "main": "./dist/index.js",
     "typings": "./dist/index.d.ts",
diff --git a/packages/fluence-js/src/__test__/integration/avm.spec.ts b/packages/fluence-js/src/__test__/integration/avm.spec.ts
index bf414f5a..4947e168 100644
--- a/packages/fluence-js/src/__test__/integration/avm.spec.ts
+++ b/packages/fluence-js/src/__test__/integration/avm.spec.ts
@@ -85,7 +85,10 @@ describe('Avm spec', () => {
                             (call %init_peer_id% ("peer" "timeout") [1000 arg] $result)
                             (call %init_peer_id% ("op" "identity") ["fast_result"] $result)
                         )
-                        (call %init_peer_id% ("return" "return") [$result.$[0]]) 
+                        (seq
+                            (canon %init_peer_id% $result #result)
+                            (call %init_peer_id% ("return" "return") [#result.$[0]]) 
+                        )
                     )
                 )
             `;
@@ -121,13 +124,19 @@ describe('Avm spec', () => {
                                 (call "invalid_peer" ("op" "identity") ["never"] $ok_or_err) 
                             )
                             (xor
-                                (match $ok_or_err.$[0] "timeout_msg"
-                                    (ap "failed_with_timeout" $result)
+                                (seq
+                                    (canon %init_peer_id% $ok_or_err #ok_or_err)
+                                    (match #ok_or_err.$[0] "timeout_msg"
+                                        (ap "failed_with_timeout" $result)
+                                    )
                                 )
                                 (ap "impossible happened" $result)
                             )
                         )
-                        (call %init_peer_id% ("return" "return") [$result.$[0]]) 
+                        (seq
+                            (canon %init_peer_id% $result #result)
+                            (call %init_peer_id% ("return" "return") [#result.$[0]]) 
+                        )
                     )
                 )
             `;