chore(aqua): Fix type duplication (#341)

Fail if fluence-cli artifact is no found

.github/workflows/e2e.yml

@@ -7,6 +7,7 @@ on:
       - ".github/**"
       - "!.github/workflows/e2e.yml"
       - "!.github/workflows/snapshot.yml"
+      - "!.github/workflows/tests.yml"
     types:
       - "labeled"
       - "synchronize"
@@ -20,6 +21,7 @@ on:
       - ".github/**"
       - "!.github/workflows/e2e.yml"
       - "!.github/workflows/snapshot.yml"
+      - "!.github/workflows/tests.yml"
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"
@@ -67,3 +69,4 @@ jobs:
     with:
       ref: ${{ github.ref }}
       nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
+      if-no-artifacts-found: warn

.github/workflows/run-tests.yml

@@ -7,6 +7,7 @@ on:
       - ".github/**"
       - "!.github/workflows/run-tests.yml"
       - "!.github/workflows/tests.yml"
+      - "!.github/workflows/e2e.yml"
     types:
       - "labeled"
       - "synchronize"
@@ -20,6 +21,7 @@ on:
       - ".github/**"
       - "!.github/workflows/run-tests.yml"
       - "!.github/workflows/tests.yml"
+      - "!.github/workflows/e2e.yml"
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"

.github/workflows/tests.yml

@@ -15,6 +15,10 @@ on:
         description: "@fluencelabs/cli version"
         type: string
         default: "main"
+      if-no-artifacts-found:
+        description: "What to do when no artifacts found in setup-* actions"
+        type: string
+        default: "error"
       cargo-dependencies:
         description: "Cargo dependencies map"
         type: string
@@ -81,6 +85,7 @@ jobs:
         with:
           artifact: fcli
           version: ${{ inputs.fcli-version }}
+          if-no-artifact-found: ${{ inputs.if-no-artifacts-found }}
 
       - name: Setup Rust toolchain
         uses: dsherret/rust-toolchain-file@v1

INSTALL.md

@@ -7,7 +7,7 @@ dependencies:
   npm:
     "@fluencelabs/registry": 0.6.2
 ```
-And then run `fluence dep npm i`
+And then run `fluence dep i`
 
 If you are developing from scratch without Fluence CLI, you should install it via npm:
 

aqua-tests/fluence.yaml

@@ -13,6 +13,6 @@ dependencies:
     marine: 0.14.1
     mrepl: 0.21.3
   npm:
-    '@fluencelabs/aqua-lib': 0.9.0
+    '@fluencelabs/aqua-lib': 0.9.1
-    '@fluencelabs/spell': 0.6.0
+    '@fluencelabs/spell': 0.6.9
-    '@fluencelabs/trust-graph': 3.1.2
+    '@fluencelabs/trust-graph': 0.4.11

aqua-tests/spell/spell.aqua

@@ -1,3 +1,7 @@
+aqua TestSpell
+
+export spell
+
 import Op, Debug, Peer, Kademlia from "@fluencelabs/aqua-lib/builtin.aqua"
 import Spell from "@fluencelabs/spell/spell_service.aqua"
 import Compare from "@fluencelabs/aqua-lib/math.aqua"

aqua/package-lock.json

@@ -9,19 +9,19 @@
       "version": "0.9.4",
       "license": "MIT",
       "dependencies": {
-        "@fluencelabs/aqua-lib": "0.9.0",
+        "@fluencelabs/aqua-lib": "0.9.1",
-        "@fluencelabs/trust-graph": "0.4.10"
+        "@fluencelabs/trust-graph": "0.4.11"
       }
     },
     "node_modules/@fluencelabs/aqua-lib": {
-      "version": "0.9.0",
+      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.9.0.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.9.1.tgz",
-      "integrity": "sha512-V0xhc0UXBF6kjfL9Y/agWGQuW+ie2zckj37KWv8Dq4teYuo9N94O4Ynm7XULWHaaWtbWvzFcDcc6nc9qG7gxcQ=="
+      "integrity": "sha512-W4KBhUkFC/kb3Mvjmhpnz0vvtr1kqpV8IWTWlbitzzS1k5FhODQYP2k7ROkDyjEztg/7Bn5eunstEHr9Sxj6qA=="
     },
     "node_modules/@fluencelabs/trust-graph": {
-      "version": "0.4.10",
+      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/trust-graph/-/trust-graph-0.4.10.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/trust-graph/-/trust-graph-0.4.11.tgz",
-      "integrity": "sha512-Ixo1ifQGhCxVMDNROE4w9Dn9k9TcnpHxKS+B/PmeAlpiWwhHDprfYXU7pq6HCYGzR/nJwIvAE9T6boQAcgiMqw==",
+      "integrity": "sha512-tjtwahYw9Ol+P3SQuqiiucAqaZ9ftDXqUkNeJ/SxrJYR4zFu65yzyyQhZvUQe7msc+csLbhn03cGHqK0MKV0gA==",
       "dependencies": {
         "@fluencelabs/aqua-lib": "^0.9.0"
       }

aqua/package.json

@@ -6,8 +6,8 @@
     "*.aqua"
   ],
   "dependencies": {
-    "@fluencelabs/aqua-lib": "0.9.0",
+    "@fluencelabs/aqua-lib": "0.9.1",
-    "@fluencelabs/trust-graph": "0.4.10"
+    "@fluencelabs/trust-graph": "0.4.11"
   },
   "scripts": {
     "generate-aqua": "../service/build.sh",

aqua/resources-api.aqua

@@ -6,10 +6,6 @@ import "misc.aqua"
 import "constants.aqua"
 import "@fluencelabs/aqua-lib/builtin.aqua"
 
-alias ResourceId: string
-alias Resource: Key
-alias Error: string
-
 func getResource(resource_id: ResourceId) -> ?Resource, *Error:
   on HOST_PEER_ID:
     result, error <- getResourceHelper(resource_id)

build.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
+
 set -o errexit -o nounset -o pipefail
+set -x
 
 # set current working directory to script directory to run script from everywhere
 cd "$(dirname "$0")"
@@ -18,8 +20,8 @@ packed_archive_file_name_pattern="fluencelabs-registry-"
 packed_archive_file_name=$(find "./aqua" -type f -name "${packed_archive_file_name_pattern}*")
 
 cd ./aqua-tests
-echo "    '@fluencelabs/registry': file:../../.$packed_archive_file_name" >> "./fluence.yaml"
+echo "    '@fluencelabs/registry': file:.$packed_archive_file_name" >> "./fluence.yaml"
-fluence dep npm i
+fluence dep i
 fluence aqua -i ./spell/spell.aqua --no-relay --air -o "../$DISTRO_TARGET/air"
 cd -