From 59c093dc39c1878e983a98e2e31803d89f85bdd0 Mon Sep 17 00:00:00 2001 From: Edoardo Vacchi Date: Thu, 22 Aug 2024 17:11:28 +0200 Subject: [PATCH] remove toHostModules() and use instance.hostFunctions() Signed-off-by: Edoardo Vacchi --- .../main/java/com/dylibso/chicory/wasi/WasiPreview1.java | 8 -------- .../java/com/dylibso/chicory/wasi/WasiPreview1Test.java | 8 ++++++-- .../java/com/dylibso/chicory/wasi/WasiTestRunner.java | 7 +++++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java b/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java index f8e4f9000..b76d650ac 100644 --- a/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java +++ b/wasi/src/main/java/com/dylibso/chicory/wasi/WasiPreview1.java @@ -16,7 +16,6 @@ import com.dylibso.chicory.log.Logger; import com.dylibso.chicory.log.SystemLogger; -import com.dylibso.chicory.runtime.HostFunction; import com.dylibso.chicory.runtime.Instance; import com.dylibso.chicory.runtime.Memory; import com.dylibso.chicory.runtime.exceptions.WASMRuntimeException; @@ -1336,13 +1335,6 @@ public static HostModuleInstance instance(HostModule hostModule, WasiPreview1 in .build(); } - @Deprecated - public HostFunction[] toHostFunctions() { - HostModule hostModule = WasiPreview1.toHostModule(); - HostModuleInstance instance = WasiPreview1.instance(hostModule, this); - return instance.hostFunctions(); - } - private Value[] wasiResult(WasiErrno errno) { if (errno != WasiErrno.ESUCCESS) { logger.info("result = " + errno.name()); diff --git a/wasi/src/test/java/com/dylibso/chicory/wasi/WasiPreview1Test.java b/wasi/src/test/java/com/dylibso/chicory/wasi/WasiPreview1Test.java index c857f6804..9c7e7138d 100644 --- a/wasi/src/test/java/com/dylibso/chicory/wasi/WasiPreview1Test.java +++ b/wasi/src/test/java/com/dylibso/chicory/wasi/WasiPreview1Test.java @@ -27,7 +27,9 @@ public void shouldRunWasiModule() { var fakeStdout = new MockPrintStream(); var wasi = new WasiPreview1(this.logger, WasiOptions.builder().withStdout(fakeStdout).build()); - var imports = new HostImports(wasi.toHostFunctions()); + var imports = + new HostImports( + WasiPreview1.instance(WasiPreview1.toHostModule(), wasi).hostFunctions()); Instance.builder(loadModule("compiled/hello-wasi.wat.wasm")) .withHostImports(imports) .build(); @@ -40,7 +42,9 @@ public void shouldRunWasiRustModule() { var expected = "Hello, World!"; var stdout = new MockPrintStream(); var wasi = new WasiPreview1(this.logger, WasiOptions.builder().withStdout(stdout).build()); - var imports = new HostImports(wasi.toHostFunctions()); + var imports = + new HostImports( + WasiPreview1.instance(WasiPreview1.toHostModule(), wasi).hostFunctions()); Instance.builder(loadModule("compiled/hello-wasi.rs.wasm")) .withHostImports(imports) .build(); // run _start and prints Hello, World! diff --git a/wasi/src/test/java/com/dylibso/chicory/wasi/WasiTestRunner.java b/wasi/src/test/java/com/dylibso/chicory/wasi/WasiTestRunner.java index cf7bf4fa5..e62befdf0 100644 --- a/wasi/src/test/java/com/dylibso/chicory/wasi/WasiTestRunner.java +++ b/wasi/src/test/java/com/dylibso/chicory/wasi/WasiTestRunner.java @@ -82,9 +82,12 @@ public static void execute( } private static int execute(File test, WasiOptions wasiOptions) { - try (var wasi = new WasiPreview1(LOGGER, wasiOptions)) { + try (var wasi = + WasiPreview1.instance( + WasiPreview1.toHostModule(), new WasiPreview1(LOGGER, wasiOptions))) { + Instance.builder(Parser.parse(test)) - .withHostImports(new HostImports(wasi.toHostFunctions())) + .withHostImports(new HostImports(wasi.hostFunctions())) .build(); } catch (WasiExitException e) { return e.exitCode();