From cfecf86ab59cf1fad5e880240705ec5bb0a09c6e Mon Sep 17 00:00:00 2001
From: Maria Kuklina <101095419+kmd-fl@users.noreply.github.com>
Date: Fri, 9 Jun 2023 14:44:06 +0200
Subject: [PATCH] fix: distro crate config and modules names (#82)

* fix service config for distro crate
---
 .gitignore                          | 1 +
 service/{ => artifacts}/Config.toml | 8 +++-----
 service/build.sh                    | 4 +++-
 service/distro/src/lib.rs           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename service/{ => artifacts}/Config.toml (61%)

diff --git a/.gitignore b/.gitignore
index de46f09..24fa853 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ example/generated/**
 .idea
 
 service/artifacts/*
+!service/artifacts/Config.toml
 builtin-package/*.wasm
 
 **/node_modules
diff --git a/service/Config.toml b/service/artifacts/Config.toml
similarity index 61%
rename from service/Config.toml
rename to service/artifacts/Config.toml
index 26f5952..d62326d 100644
--- a/service/Config.toml
+++ b/service/artifacts/Config.toml
@@ -1,17 +1,15 @@
-modules_dir = "artifacts/"
-
 [[module]]
     name = "ipfs_effector"
     mem_pages_count = 100
     logger_enabled = true
 
     [module.mounted_binaries]
-    ipfs = "/opt/homebrew/bin/ipfs"
+    ipfs = "/usr/bin/ipfs"
 
     [module.wasi]
-    envs = { "/tmp/vault" = "/tmp" }
+    preopend_files = ["tmp"]
+    mapped_dirs = { "tmp" = "." }
 
 [[module]]
     name = "ipfs_pure"
-    mem_pages_count = 100
     logger_enabled = true
diff --git a/service/build.sh b/service/build.sh
index 19fc3ea..d4c0066 100755
--- a/service/build.sh
+++ b/service/build.sh
@@ -19,4 +19,6 @@ cp target/wasm32-wasi/release/ipfs_pure.wasm artifacts/
 marine aqua artifacts/ipfs_pure.wasm -s Ipfs -i aqua-ipfs >../aqua/ipfs.aqua
 
 mkdir -p distro/ipfs-service
-cp -v artifacts/ipfs_effector.wasm artifacts/ipfs_pure.wasm Config.toml distro/ipfs-service
+cp -v artifacts/ipfs_effector.wasm artifacts/ipfs_pure.wasm artifacts/Config.toml distro/ipfs-service
+cd distro
+cargo build
diff --git a/service/distro/src/lib.rs b/service/distro/src/lib.rs
index d9367e8..a886e9f 100644
--- a/service/distro/src/lib.rs
+++ b/service/distro/src/lib.rs
@@ -10,7 +10,7 @@ pub use build_info::PKG_VERSION as VERSION;
 
 pub fn modules() -> std::collections::HashMap<&'static str, &'static [u8]> {
     maplit::hashmap! {
-        "facade" => IPFS_FACADE,
-        "effector" => IPFS_EFFECTOR,
+        "ipfs_pure" => IPFS_FACADE,
+        "ipfs_effector" => IPFS_EFFECTOR,
     }
 }