Fix lints

Signed-off-by: Sam Batschelet <sam.batschelet@avalabs.org>

x/programs/examples/imports/program/program.go

@@ -104,8 +104,16 @@ func (i *Import) invokeProgramFn(
 	// spend the maximum number of units allowed for this call
 	i.meter.Spend(maxUnits)
 
+	cfg, err := runtime.NewConfigBuilder(maxUnits).Build()
+	if err != nil {
+		i.log.Error("failed to create runtime config",
+			zap.Error(err),
+		)
+		return -1
+	}
+
 	// create a new runtime for the program to be invoked
-	rt := runtime.New(i.log, runtime.NewConfigBuilder(maxUnits).Build(), i.imports)
+	rt := runtime.New(i.log, cfg, i.imports)
 	err = rt.Initialize(context.Background(), programWasmBytes)
 	if err != nil {
 		i.log.Error("failed to initialize runtime",

x/programs/examples/token_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/utils/logging"
+	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/hypersdk/x/programs/examples/imports/hashmap"
 	"github.com/ava-labs/hypersdk/x/programs/runtime"
 	"github.com/ava-labs/hypersdk/x/programs/utils"
@@ -41,12 +42,13 @@ func TestTokenProgram(t *testing.T) {
 	imports := make(runtime.Imports)
 	imports["map"] = hashmap.New(log, db)
 
-	cfg := runtime.NewConfigBuilder(maxUnits).
+	cfg, err := runtime.NewConfigBuilder(maxUnits).
 		WithBulkMemory(true).
-		WithLimitMaxMemory(17 * 64 * 1024). // 17 pages
+		WithLimitMaxMemory(17 * 64 * units.KiB). // 17 pages
 		Build()
+	require.NoError(err)
 	program := NewToken(log, tokenProgramBytes, cfg, imports)
-	err := program.Run(context.Background())
+	err = program.Run(context.Background())
 	require.NoError(err)
 }
 
@@ -63,15 +65,15 @@ func BenchmarkTokenWazeroProgram(b *testing.B) {
 	b.Run("benchmark_token_program", func(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			b.StopTimer()
-			cfg := runtime.NewConfigBuilder(maxUnits).
+			cfg, err := runtime.NewConfigBuilder(maxUnits).
 				WithBulkMemory(true).
-				WithLimitMaxMemory(17 * 64 * 1024). // 17 pages
+				WithLimitMaxMemory(17 * 64 * units.KiB). // 17 pages
 				WithDefaultCache(true).
 				Build()
-
+			require.NoError(err)
 			program := NewToken(log, tokenProgramBytes, cfg, imports)
 			b.StartTimer()
-			err := program.Run(context.Background())
+			err = program.Run(context.Background())
 			require.NoError(err)
 		}
 	})

x/programs/runtime/config.go

@@ -125,7 +125,7 @@ func (b *builder) WithDefaultCache(enabled bool) *builder {
 	return b
 }
 
-func (b *builder) Build() *Config {
+func (b *builder) Build() (*Config, error) {
 	cfg := defaultWasmtimeConfig()
 	if b.maxWasmStack == 0 {
 		b.maxWasmStack = defaultMaxWasmStack
@@ -137,7 +137,10 @@ func (b *builder) Build() *Config {
 	cfg.SetWasmSIMD(b.simd)
 	cfg.SetProfiler(b.profilingStrategy)
 	if b.defaultCache {
-		cfg.CacheConfigLoadDefault()
+		err := cfg.CacheConfigLoadDefault()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	if b.limitMaxMemory == 0 {
@@ -154,7 +157,7 @@ func (b *builder) Build() *Config {
 		limitMaxMemories:      1,
 		compileStrategy:       b.compileStrategy,
 		meterMaxUnits:         b.meterMaxUnits,
-	}
+	}, nil
 }
 
 // non-configurable defaults

x/programs/runtime/memory_test.go

@@ -13,15 +13,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var (
-	log = logging.NewLogger(
-		"",
-		logging.NewWrappedCore(
-			logging.Info,
-			os.Stderr,
-			logging.Plain.ConsoleEncoder(),
-		))
-)
+var log = logging.NewLogger(
+	"",
+	logging.NewWrappedCore(
+		logging.Info,
+		os.Stderr,
+		logging.Plain.ConsoleEncoder(),
+	))
 
 func TestLimitMaxMemory(t *testing.T) {
 	require := require.New(t)
@@ -38,9 +36,10 @@ func TestLimitMaxMemory(t *testing.T) {
 
 	// wasm defines 2 pages of memory but runtime set max 1 page
 	maxFee := uint64(1)
-	cfg := NewConfigBuilder(maxFee).
+	cfg, err := NewConfigBuilder(maxFee).
 		WithLimitMaxMemory(1 * 64 * units.KiB). // 1 pages
 		Build()
+	require.NoError(err)
 	runtime := New(log, cfg, nil)
 	err = runtime.Initialize(context.Background(), wasm)
 	require.ErrorContains(err, "memory minimum size of 2 pages exceeds memory limits")
@@ -59,11 +58,12 @@ func TestLimitMaxMemoryGrow(t *testing.T) {
 	require.NoError(err)
 
 	maxFee := uint64(1)
-	cfg := NewConfigBuilder(maxFee).
+	cfg, err := NewConfigBuilder(maxFee).
 		WithLimitMaxMemory(1 * 64 * units.KiB). // 2 pages
 		Build()
+	require.NoError(err)
 	runtime := New(logging.NoLog{}, cfg, nil)
-	err = runtime.Initialize(context.Background(), []byte(wasm))
+	err = runtime.Initialize(context.Background(), wasm)
 	require.NoError(err)
 
 	length, err := runtime.Memory().Len()
@@ -88,11 +88,12 @@ func TestWriteExceedsLimitMaxMemory(t *testing.T) {
 	require.NoError(err)
 
 	maxFee := uint64(1)
-	cfg := NewConfigBuilder(maxFee).
+	cfg, err := NewConfigBuilder(maxFee).
 		WithLimitMaxMemory(1 * 64 * units.KiB). // 2 pages
 		Build()
+	require.NoError(err)
 	runtime := New(logging.NoLog{}, cfg, nil)
-	err = runtime.Initialize(context.Background(), []byte(wasm))
+	err = runtime.Initialize(context.Background(), wasm)
 	require.NoError(err)
 	maxMemory, err := runtime.Memory().Len()
 	require.NoError(err)
@@ -101,7 +102,3 @@ func TestWriteExceedsLimitMaxMemory(t *testing.T) {
 	err = runtime.Memory().Write(0, bytes)
 	require.Error(err, "write memory failed: invalid memory size")
 }
-
-func BenchmarkXxx(b *testing.B) {
-
-}

x/programs/runtime/meter.go

@@ -5,11 +5,9 @@ import "github.com/bytecodealliance/wasmtime-go/v12"
 var _ Meter = (*meter)(nil)
 
 // NewMeter returns a new meter.
-func NewMeter(store *wasmtime.Store, maxUnits uint64) Meter {
-	store.AddFuel(maxUnits)
+func NewMeter(store *wasmtime.Store) Meter {
 	return &meter{
-		maxUnits: maxUnits,
-		store:    store,
+		store: store,
 	}
 }
 

x/programs/runtime/runtime.go

@@ -6,7 +6,6 @@ package runtime
 import (
 	"context"
 	"fmt"
-	// "time"
 
 	"github.com/bytecodealliance/wasmtime-go/v12"
 	"go.uber.org/zap"
@@ -42,7 +41,6 @@ type runtime struct {
 }
 
 func (r *runtime) Initialize(_ context.Context, programBytes ProgramBytes) (err error) {
-
 	r.store = wasmtime.NewStore(wasmtime.NewEngineWithConfig(r.cfg.engine))
 	r.store.Limiter(
 		r.cfg.limitMaxMemory,
@@ -86,9 +84,11 @@ func (r *runtime) Initialize(_ context.Context, programBytes ProgramBytes) (err
 		return err
 	}
 
-	r.meter = NewMeter(r.store, r.cfg.meterMaxUnits)
-
-	// start := time.Now()
+	r.meter = NewMeter(r.store)
+	err = r.meter.AddUnits(r.cfg.meterMaxUnits)
+	if err != nil {
+		return err
+	}
 
 	imports := getRegisteredImportModules(r.mod.Imports())
 	// register host functions exposed to the guest (imports)
@@ -109,8 +109,6 @@ func (r *runtime) Initialize(_ context.Context, programBytes ProgramBytes) (err
 		}
 	}
 
-	// r.log.Info("time taken to register host functions", zap.Int("ms", int(time.Since(start).Milliseconds())))
-
 	// instantiate the module with all of the imports defined by the linker
 	r.inst, err = link.Instantiate(r.store, r.mod)
 	if err != nil {
@@ -122,7 +120,7 @@ func (r *runtime) Initialize(_ context.Context, programBytes ProgramBytes) (err
 
 func getRegisteredImportModules(importTypes []*wasmtime.ImportType) []string {
 	u := map[string]bool{}
-	var imports []string
+	imports := make([]string, len(importTypes))
 	for _, t := range importTypes {
 		mod := t.Module()
 		if u[mod] {
@@ -134,7 +132,7 @@ func getRegisteredImportModules(importTypes []*wasmtime.ImportType) []string {
 	return imports
 }
 
-func (r *runtime) Call(ctx context.Context, name string, params ...interface{}) ([]uint64, error) {
+func (r *runtime) Call(_ context.Context, name string, params ...interface{}) ([]uint64, error) {
 	var api *wasmtime.Func
 
 	switch name {
@@ -172,7 +170,7 @@ func (r *runtime) Meter() Meter {
 	return r.meter
 }
 
-func (r *runtime) Stop(ctx context.Context) error {
+func (r *runtime) Stop(_ context.Context) error {
 	r.store.SetEpochDeadline(0)
 	return nil
 }

x/programs/utils/utils.go

@@ -11,8 +11,10 @@ import (
 	"github.com/ava-labs/hypersdk/state"
 )
 
-var _ state.Mutable = &testDB{}
-var _ state.Immutable = &testDB{}
+var (
+	_ state.Mutable   = &testDB{}
+	_ state.Immutable = &testDB{}
+)
 
 type testDB struct {
 	db *memdb.Database