From 3cab9d6848d84865099facb5b1a1f8eeeac82ec9 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Mon, 28 Nov 2022 13:09:03 +0400 Subject: [PATCH 1/4] Fix failing tests in AquaVM --- .../fluence-js/src/__test__/integration/avm.spec.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/fluence-js/src/__test__/integration/avm.spec.ts b/packages/fluence-js/src/__test__/integration/avm.spec.ts index bf414f5ab..fd828b8f7 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]]) + ) ) ) `; @@ -127,7 +130,10 @@ describe('Avm spec', () => { (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]]) + ) ) ) `; From ec726da5c6c5f959786369ee584692ea05e1b502 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Mon, 28 Nov 2022 11:20:35 +0200 Subject: [PATCH 2/4] Add ref input --- .github/workflows/snapshot.yml | 5 +++++ .github/workflows/tests.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 5aa0ddda4..56c1524f7 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 cf2514ccb..a33f8a7a0 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 From 5ee8a3adc1f943edae34beab9addfe8bfe14cb33 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Mon, 28 Nov 2022 13:51:19 +0400 Subject: [PATCH 3/4] one more fix --- packages/fluence-js/src/__test__/integration/avm.spec.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/fluence-js/src/__test__/integration/avm.spec.ts b/packages/fluence-js/src/__test__/integration/avm.spec.ts index fd828b8f7..4947e1688 100644 --- a/packages/fluence-js/src/__test__/integration/avm.spec.ts +++ b/packages/fluence-js/src/__test__/integration/avm.spec.ts @@ -124,8 +124,11 @@ 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) ) From dcdad05578cd20cf98c2ee74dcc98ee7339c2d7f Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Mon, 28 Nov 2022 14:38:30 +0400 Subject: [PATCH 4/4] Bump version --- packages/fluence-js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fluence-js/package.json b/packages/fluence-js/package.json index 0cac9cc5b..71fc2c908 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",