feat(deps)!: update to marine runtime with memory limits (#98)

update marine
fluencelabs · Dec 14, 2023 · f772635 · f772635
1 parent 0e164f3
commit f772635
Show file tree

Hide file tree

Showing 15 changed files with 768 additions and 392 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ trybuild = "1.0"
 [dependencies]
 marine-test-macro = { path = "crates/marine-test-macro", version = "=0.11.1" }
 marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.11.1" }
-fluence-app-service = { version = "0.29.0", features = ["raw-module-api"] }
+fluence-app-service = { version = "0.31.0", features = ["raw-module-api"] }
 
 serde = { version = "1.0.162", features = ["derive"] }
 serde_json = "1.0.96"

diff --git a/crates/marine-test-macro-impl/Cargo.toml b/crates/marine-test-macro-impl/Cargo.toml
@@ -14,8 +14,8 @@ license = "Apache-2.0"
 all-features = true
 
 [dependencies]
-fluence-app-service = { version = "0.29.0", features = ["raw-module-api"] }
-marine-it-parser = "0.13.0"
+fluence-app-service = { version = "0.31.0", features = ["raw-module-api"] }
+marine-it-parser = "0.15.0"
 itertools = "0.10.5"
 darling = "0.20.1"
 quote = "1.0.26"

diff --git a/crates/marine-test-macro-impl/tests/generation_tests/empty_func/Config.toml b/crates/marine-test-macro-impl/tests/generation_tests/empty_func/Config.toml
@@ -1,4 +1,5 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "greeting"

diff --git a/crates/marine-test-macro-impl/tests/generation_tests/mounted_binary/Config.toml b/crates/marine-test-macro-impl/tests/generation_tests/mounted_binary/Config.toml
@@ -1,4 +1,5 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "greeting"

diff --git a/crates/marine-test-macro-impl/tests/generation_tests/multi-service-empty_mod/Config.toml b/crates/marine-test-macro-impl/tests/generation_tests/multi-service-empty_mod/Config.toml
@@ -1,4 +1,5 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "greeting"

diff --git a/...rine-test-macro-impl/tests/generation_tests/multi-service-multiple/empty_func/Config.toml b/...rine-test-macro-impl/tests/generation_tests/multi-service-multiple/empty_func/Config.toml
@@ -1,4 +1,5 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "greeting"

diff --git a/...-test-macro-impl/tests/generation_tests/multi-service-multiple/mounted_binary/Config.toml b/...-test-macro-impl/tests/generation_tests/multi-service-multiple/mounted_binary/Config.toml
@@ -1,4 +1,5 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "greeting"

diff --git a/...marine-test-macro-impl/tests/generation_tests/multi-service-single/empty_func/Config.toml b/...marine-test-macro-impl/tests/generation_tests/multi-service-single/empty_func/Config.toml
@@ -1,4 +1,5 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "greeting"

diff --git a/crates/marine-test-macro-impl/tests/generation_tests/multiple_modules/Config.toml b/crates/marine-test-macro-impl/tests/generation_tests/multiple_modules/Config.toml
@@ -1,4 +1,6 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
+
 [[module]]
     name = "greeting"
     mem_pages_count = 1

diff --git a/examples/build_rs/Config.toml b/examples/build_rs/Config.toml
@@ -1,6 +1,6 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "build_rs_test"
-    max_heap_size = "10 KiB"
     logger_enabled = false
diff --git a/examples/multi-service/consumer/Config.toml b/examples/multi-service/consumer/Config.toml
@@ -1,6 +1,6 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "consumer"
-    max_heap_size = "10 KiB"
     logger_enabled = false
diff --git a/examples/multi-service/producer/Config.toml b/examples/multi-service/producer/Config.toml
@@ -1,6 +1,6 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "producer"
-    max_heap_size = "10 KiB"
     logger_enabled = false
diff --git a/examples/single-service/Config.toml b/examples/single-service/Config.toml
@@ -1,6 +1,6 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"
 
 [[module]]
     name = "greeting"
-    max_heap_size = "10 KiB"
     logger_enabled = false
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-12-01"
+channel = "nightly-2023-12-10"
 targets = [ "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "wasm32-wasi" ]
 components = ["clippy", "rustfmt"]