Skip to content

Commit

Permalink
fix(host imports): add mounted binaries for __marine_host_api_v3
Browse files Browse the repository at this point in the history
  • Loading branch information
ValeryAntopol committed Feb 29, 2024
1 parent 9bfcb6a commit 10792fa
Showing 1 changed file with 12 additions and 21 deletions.
33 changes: 12 additions & 21 deletions marine/src/config/marine_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,31 +235,22 @@ impl<'c, WB: WasmBackend> TryFrom<WithContext<'c, TomlMarineModuleConfig>>
})
.collect::<Result<Vec<_>, Self::Error>>()?;

let mut host_cli_imports_v0 = HashMap::new();
let mut host_cli_imports_v1 = HashMap::new();
let mut host_cli_imports_v2 = HashMap::new();
let mut host_imports = HashMap::from([
(HostAPIVersion::V0, HashMap::new()),
(HostAPIVersion::V1, HashMap::new()),
(HostAPIVersion::V2, HashMap::new()),
(HostAPIVersion::V3, HashMap::new()),
]);
for (import_name, host_cmd) in mounted_binaries {
let host_cmd = as_relative_to_base(context.base_path.as_deref(), &host_cmd)?;
host_cli_imports_v0.insert(
import_name.clone(),
crate::host_imports::create_mounted_binary_import(host_cmd.clone()),
);
host_cli_imports_v1.insert(
import_name.clone(),
crate::host_imports::create_mounted_binary_import(host_cmd.clone()),
);
host_cli_imports_v2.insert(
import_name,
crate::host_imports::create_mounted_binary_import(host_cmd),
);
for (_, host_cli_imports) in &mut host_imports {
host_cli_imports.insert(
import_name.clone(),
crate::host_imports::create_mounted_binary_import(host_cmd.clone()),
);
}
}

let host_imports = HashMap::from([
(HostAPIVersion::V0, host_cli_imports_v0),
(HostAPIVersion::V1, host_cli_imports_v1),
(HostAPIVersion::V2, host_cli_imports_v2),
]);

let wasi = toml_config.wasi.map(|w| w.try_into()).transpose()?;

Ok(MarineModuleConfig {
Expand Down

0 comments on commit 10792fa

Please sign in to comment.