Further corrections based on CI.

linera-io · Feb 22, 2025 · fadb489 · fadb489
1 parent 9ac4250
commit fadb489
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/linera-core/Cargo.toml b/linera-core/Cargo.toml
@@ -12,8 +12,8 @@ repository.workspace = true
 version.workspace = true
 
 [features]
-wasmer = ["linera-execution/wasmer", "linera-storage/wasmer"]
-wasmtime = ["linera-execution/wasmtime", "linera-storage/wasmtime"]
+wasmer = ["linera-execution/wasmer", "linera-storage/wasmer", "linera-base/wasmer"]
+wasmtime = ["linera-execution/wasmtime", "linera-storage/wasmtime", "linera-base/wasmtime"]
 test = [
     "anyhow",
     "linera-base/test",

diff --git a/linera-execution/Cargo.toml b/linera-execution/Cargo.toml
@@ -20,6 +20,7 @@ revm = [
     "dep:alloy-sol-types",
     "dep:hex",
     "dep:tempfile",
+    "linera-base/revm",
 ]
 fs = ["tokio/fs"]
 metrics = ["prometheus", "linera-views/metrics"]
@@ -28,13 +29,15 @@ wasmer = [
     "dep:wasmer",
     "wasmer/enable-serde",
     "linera-witty/wasmer",
+    "linera-base/wasmer",
     "wasm-encoder",
     "wasm-instrument",
     "wasmparser",
 ]
 wasmtime = [
     "dep:wasmtime",
     "linera-witty/wasmtime",
+    "linera-base/wasmtime",
     "wasm-encoder",
     "wasmparser",
 ]

diff --git a/linera-execution/src/lib.rs b/linera-execution/src/lib.rs
@@ -60,6 +60,8 @@ use thiserror::Error;
 pub use crate::applications::ApplicationRegistry;
 #[cfg(with_revm)]
 use crate::revm::EvmExecutionError;
+#[cfg(all(with_revm, not(with_wasmer), not(with_wasmtime)))]
+use linera_base::vm::EvmRuntime;
 use crate::runtime::ContractSyncRuntime;
 #[cfg(all(with_testing, with_wasm_runtime))]
 pub use crate::wasm::test as wasm_test;

diff --git a/linera-sdk/Cargo.toml b/linera-sdk/Cargo.toml
@@ -22,12 +22,14 @@ targets = ["wasm32-unknown-unknown", "x86_64-unknown-linux-gnu"]
 ethereum = ["async-trait", "linera-ethereum"]
 unstable-oracles = ["linera-core/unstable-oracles", "linera-execution/unstable-oracles"]
 wasmer = [
+    "linera-base/wasmer",
     "linera-core/wasmer",
     "linera-execution/wasmer",
     "linera-storage/wasmer",
     "linera-witty/wasmer",
 ]
 wasmtime = [
+    "linera-base/wasmtime",
     "linera-core/wasmtime",
     "linera-execution/wasmtime",
     "linera-storage/wasmtime",