feat: remove module configs from worker definition (#284)

.github/workflows/e2e.yml

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

fluence.yaml

@@ -9,7 +9,7 @@ version: 8
 aquaDependencies:
   "@fluencelabs/spell":  file:./src/aqua/spell/fluencelabs-spell-0.7.4.tgz # x-release-please-version
   "@fluencelabs/installation-spell": file:./src/aqua/installation-spell/fluencelabs-installation-spell-0.7.4.tgz # x-release-please-version
-  "@fluencelabs/aqua-lib": 0.10.1
+  "@fluencelabs/aqua-lib": 0.10.2
   "@fluencelabs/registry": 0.9.4
   "@fluencelabs/aqua-ipfs": 0.5.31
 

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

@@ -16,8 +16,8 @@ data LocalSpell:
     init_args: ⊤
 
 data LocalModule:
+    name: string
     wasm: Path
-    config: string
 
 data LocalService:
     name: string
@@ -41,8 +41,8 @@ data LocalAppDeployConfig:
 
 -- uploaded DTOs
 data Module:
+    name: string
     wasm: CID
-    config: CID
 
 data Service:
     name: string

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

@@ -2,7 +2,6 @@ aqua Json declares *
 
 import JsonString from "./types.aqua"
 import WorkerDefinition from "./config.aqua"
-import ModuleConfig from "@fluencelabs/aqua-lib/builtin.aqua"
 import TriggerConfig from "@fluencelabs/spell/spell_service.aqua"
 import Status from "./types.aqua"
 
@@ -13,9 +12,6 @@ service WDJson("json"):
 service JsonStr("json"):
     parse(s: JsonString) -> string
 
-service ModuleConfigJson("json"):
-    parse(json: JsonString) -> ModuleConfig
-
 service TriggerConfigJson("json"):
     parse(json: JsonString) -> TriggerConfig
     stringify(cfg: TriggerConfig) -> JsonString
@@ -25,4 +21,4 @@ service Json("json"):
 
 service StatusJson("json"):
     parse(json: JsonString) -> Status
-    stringify(status: Status) -> JsonString
+    stringify(status: Status) -> JsonString

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

@@ -6,7 +6,7 @@ import Spell from "@fluencelabs/spell/spell_service.aqua"
 import PeerSpell from "@fluencelabs/spell/api.aqua"
 import Srv from "@fluencelabs/aqua-lib/builtin.aqua"
 
-import WDJson, ModuleConfigJson, TriggerConfigJson, JsonStr from "./json.aqua"
+import WDJson, TriggerConfigJson, JsonStr from "./json.aqua"
 import SpellDefinition, Service from "./config.aqua"
 import Multiaddr, CID from "./types.aqua"
 import log from "./log.aqua"
@@ -142,13 +142,14 @@ func download_service(s: Service, ipfs: Multiaddr) -> []Hash:
     hashes: *Hash
     for m <- s.modules:
         get_wasm <- get_from(HOST_PEER_ID, m.wasm, ipfs)
-        json_cfg <- cat_from(HOST_PEER_ID, m.config, ipfs)
-        if get_wasm.success && json_cfg.success:
-            cfg <- ModuleConfigJson.parse(json_cfg.contents)
+        if get_wasm.success:
             on HOST_PEER_ID:
-                hashes <<- Dist.add_module_from_vault(get_wasm.path, cfg)
+                try:
+                    hashes <<- Dist.add_module_bytes_from_vault(m.name, get_wasm.path)
+                catch e:
+                    log([s.name, "error adding module", m.name, e])
         else:
-            log([s.name, "error retrieving module", ["wasm", m.wasm, get_wasm], ["config", m.config, json_cfg]])
+            log([s.name, "error retrieving module", m.name, ["wasm", m.wasm, get_wasm]])
     <- hashes
 
 func install(ipfs: Multiaddr, worker_def_cid: CID):

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

@@ -19,8 +19,7 @@ func upload_worker_config(ipfs: Multiaddr, config: LocalWorkerConfig) -> CID:
         modules: *Module
         for m <- s.modules:
             wasm <- IpfsClient.upload(ipfs, m.wasm)
-            cfg <- IpfsClient.upload_string(ipfs, m.config)
-            modules <<- Module(wasm = wasm, config = cfg)
+            modules <<- Module(name = m.name, wasm = wasm)
         services <<- Service(name = s.name, modules = modules, total_memory_limit = s.total_memory_limit)
 
     for sp <- config.spells: