remove toHostModules() and use instance.hostFunctions()

Signed-off-by: Edoardo Vacchi <[email protected]>
dylibso · Aug 22, 2024 · 59c093d · 59c093d
1 parent afa9b5c
commit 59c093d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 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
@@ -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
@@ -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
@@ -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();