internal/wasmtools, wit: rename to WasmTools to Instance

Signed-off-by: Jiaxiao Zhou <[email protected]>
bytecodealliance · Dec 11, 2024 · 4dba4ee · 4dba4ee
1 parent 78bcda8
commit 4dba4ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/internal/wasmtools/wasmtools.go b/internal/wasmtools/wasmtools.go
@@ -22,12 +22,12 @@ type Executor interface {
 	Run(ctx context.Context, args []string, stdin io.Reader, fsMap map[fs.FS]string, name *string) (stdout io.Reader, stderr io.Reader, err error)
 }
 
-type WasmTools struct {
+type Instance struct {
 	runtime wazero.Runtime
 	module  wazero.CompiledModule
 }
 
-func NewWasmTools(ctx context.Context) (*WasmTools, error) {
+func New(ctx context.Context) (*Instance, error) {
 	c := wazero.NewRuntimeConfig().WithCloseOnContextDone(true)
 	r := wazero.NewRuntimeWithConfig(ctx, c)
 	if _, err := wasi_snapshot_preview1.Instantiate(ctx, r); err != nil {
@@ -39,14 +39,14 @@ func NewWasmTools(ctx context.Context) (*WasmTools, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error compiling wasm module: %w", err)
 	}
-	return &WasmTools{runtime: r, module: module}, nil
+	return &Instance{runtime: r, module: module}, nil
 }
 
-func (w *WasmTools) Close(ctx context.Context) error {
+func (w *Instance) Close(ctx context.Context) error {
 	return w.runtime.Close(ctx)
 }
 
-func (w *WasmTools) Run(ctx context.Context, args []string, stdin io.Reader, fsMap map[fs.FS]string, name *string) (stdout io.Reader, stderr io.Reader, err error) {
+func (w *Instance) Run(ctx context.Context, args []string, stdin io.Reader, fsMap map[fs.FS]string, name *string) (stdout io.Reader, stderr io.Reader, err error) {
 	stdoutBuffer := &bytes.Buffer{}
 	stderrBuffer := &bytes.Buffer{}
 

diff --git a/wit/load.go b/wit/load.go
@@ -64,7 +64,7 @@ func loadWIT(path string, reader io.Reader) (*Resolve, error) {
 	} else {
 		stdin = reader
 	}
-	wasmTools, err := wasmtools.NewWasmTools(ctx)
+	wasmTools, err := wasmtools.New(ctx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/wit/testdata_test.go b/wit/testdata_test.go
@@ -82,7 +82,7 @@ func TestGoldenWITRoundTrip(t *testing.T) {
 		return
 	}
 	ctx := context.Background()
-	wasmTools, err := wasmtools.NewWasmTools(ctx)
+	wasmTools, err := wasmtools.New(ctx)
 	if err != nil {
 		t.Skipf("wasm-tools not available: %v", err)
 		return
@@ -103,8 +103,10 @@ func TestGoldenWITRoundTrip(t *testing.T) {
 			if stderr != nil {
 				buf := new(bytes.Buffer)
 				buf.ReadFrom(stderr)
-				t.Error(buf.String())
-				return
+				if buf.Len() > 0 {
+					t.Error(buf.String())
+					return
+				}
 			}
 			// Parse the JSON into a Resolve.
 			res2, err := DecodeJSON(stdout)