Skip to content

Commit

Permalink
fix conflicting changes (#720)
Browse files Browse the repository at this point in the history
I merged two conflicting changes without noticing.
This is the trivial fix 😅
  • Loading branch information
andreaTP authored Dec 20, 2024
1 parent 9a53caa commit e6620e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import com.dylibso.chicory.experimental.hostmodule.annotations.WasmModuleInterface;
import com.dylibso.chicory.runtime.ByteBufferMemory;
import com.dylibso.chicory.runtime.GlobalInstance;
import com.dylibso.chicory.runtime.Instance;
import com.dylibso.chicory.runtime.Memory;
Expand All @@ -29,7 +30,7 @@ class TestModule implements TestModule_ModuleImports, TestModule_ModuleExports,
public boolean func6Invoked;

public TestModule() {
memory = new Memory(new MemoryLimits(1, 2));
memory = new ByteBufferMemory(new MemoryLimits(1, 2));
table = new Table(ValueType.FuncRef, new TableLimits(10, 20));
var module =
Parser.parse(AllImportsTest.class.getResourceAsStream("/all-imports.wat.wasm"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;

import com.dylibso.chicory.experimental.hostmodule.annotations.WasmModuleInterface;
import com.dylibso.chicory.runtime.ByteBufferMemory;
import com.dylibso.chicory.runtime.Instance;
import com.dylibso.chicory.runtime.Memory;
import com.dylibso.chicory.wasm.Parser;
Expand All @@ -19,7 +20,7 @@ class TestModule implements TestModule_ModuleImports, TestModule_ModuleExports,
private final Memory memory;

public TestModule() {
memory = new Memory(new MemoryLimits(1, 2));
memory = new ByteBufferMemory(new MemoryLimits(1, 2));
var module =
Parser.parse(
MixedImportsTest.class.getResourceAsStream("/mixed-imports.wat.wasm"));
Expand Down

0 comments on commit e6620e3

Please sign in to comment.