fix(installation-spell): print logs on a service

.fluence/secrets/integration-tests-key.txt

@@ -0,0 +1 @@
+3DqrJbuj/H4cRdu0zq5eXdjcqwBJ3OgmUr7Htr3WiBw=

.github/e2e/docker-compose.yml

@@ -24,6 +24,10 @@ services:
       # - --bootstraps=/dns/nox-1/tcp/7771
       # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR
       - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq
+      - --enable-system-services=none
+      - --management-key=12D3KooWGLAmtTkqZqqKiSxXpb2j1SRjpbE2YgZZb4Unzn5VPj9p
+      - --dev-mode
     networks:
       nox:
         ipv4_address: 10.50.10.10
+

.github/workflows/e2e.yml

@@ -55,7 +55,6 @@ jobs:
       - snapshot
     uses: fluencelabs/nox/.github/workflows/build.yml@master
     with:
-      ref: restrict-effectors
       cargo-dependencies: |
         [
           {
@@ -93,7 +92,6 @@ jobs:
 
     uses: fluencelabs/nox/.github/workflows/tests.yml@master
     with:
-      ref: restrict-effectors
       cargo-dependencies: |
         [
           {

.github/workflows/release.yml

@@ -80,7 +80,7 @@ jobs:
         working-directory: ./src/spell/modules/spell/spell
         run: ./build.sh
 
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@v2.4.1
         with:
           version: 8
 
@@ -167,7 +167,7 @@ jobs:
             --skip-published \
             --yes
 
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@v2.4.1
         with:
           version: 8
 

.github/workflows/run-tests.yml

@@ -33,7 +33,7 @@ jobs:
           ref: ${{ github.ref }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v2.4.1
         with:
           version: 8
 

.github/workflows/snapshot.yml

@@ -102,7 +102,7 @@ jobs:
           path: src/spell/modules/spell
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v2.4.1
         with:
           version: 8
 

README

@@ -1 +1 @@
-# Spell
+# Spell Repo

integration-tests/framework.py

@@ -19,13 +19,17 @@ def make_key():
         return name
 
 
+
 def delete_key(name):
     with key_lock:
         c = delegator.run(f"fluence key remove {name} --no-input", block=True)
         if len(c.err) != 0:
             print(c.err)
         return name
 
+def get_key():
+        return 'integration-tests-key'
+
 
 def get_relays():
     env = os.environ.get("FLUENCE_ENV")
@@ -228,7 +232,7 @@ def init_param_opt(param_name):
     old_setup_class = getattr(cls, "setup_class", None)
 
     def setup_class(cls):
-        key_pair_name = make_key()
+        key_pair_name = get_key()
         spell_id = create_spell(key_pair_name, air_script, config, dat, alias)
         cls.spell_id = spell_id
         cls.key_pair_name = key_pair_name
@@ -245,7 +249,7 @@ def teardown_class(cls):
         if old_teardown_class is not None:
             old_teardown_class()
         destroy_spell(cls.key_pair_name, cls.spell_id)
-        delete_key(cls.key_pair_name)
+        #delete_key(cls.key_pair_name)
 
     cls.teardown_class = teardown_class
 

src/aqua/installation-spell/src/aqua/spell.aqua

@@ -161,11 +161,11 @@ func download_service(s: Service, ipfs: Multiaddr) -> []Hash:
     for m <- s.modules:
         get_wasm <- get_from(HOST_PEER_ID, m.wasm, ipfs)
         if get_wasm.success:
-            on HOST_PEER_ID:
-                try:
+            try:
+                on HOST_PEER_ID:
                     hashes <<- Dist.add_module_bytes_from_vault(m.name, get_wasm.path)
-                catch e:
-                    log([s.name, "error adding module", m.name, e])
+            catch e:
+                log([s.name, "error adding module", m.name, e])
         else:
             log([s.name, "error retrieving module", m.name, ["wasm", m.wasm, get_wasm]])
     <- hashes