switch from view to immutable

ava-labs · Jan 17, 2025 · 811920c · 811920c
1 parent 686da59
commit 811920c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/chain/chain.go b/chain/chain.go
@@ -99,10 +99,10 @@ func (c *Chain) AsyncVerify(
 func (c *Chain) PreExecute(
 	ctx context.Context,
 	parentBlk *ExecutionBlock,
-	view state.View,
+	im state.Immutable,
 	tx *Transaction,
 ) error {
-	return c.preExecutor.PreExecute(ctx, parentBlk, view, tx)
+	return c.preExecutor.PreExecute(ctx, parentBlk, im, tx)
 }
 
 func (c *Chain) ParseBlock(ctx context.Context, bytes []byte) (*ExecutionBlock, error) {

diff --git a/chain/pre_executor.go b/chain/pre_executor.go
@@ -37,10 +37,10 @@ func NewPreExecutor(
 func (p *PreExecutor) PreExecute(
 	ctx context.Context,
 	parentBlk *ExecutionBlock,
-	view state.View,
+	im state.Immutable,
 	tx *Transaction,
 ) error {
-	feeRaw, err := view.GetValue(ctx, FeeKey(p.metadataManager.FeePrefix()))
+	feeRaw, err := im.GetValue(ctx, FeeKey(p.metadataManager.FeePrefix()))
 	if err != nil {
 		return fmt.Errorf("%w: %w", ErrFailedToFetchFee, err)
 	}
@@ -81,7 +81,7 @@ func (p *PreExecutor) PreExecute(
 	// Note, [PreExecute] ensures that the pending transaction does not have
 	// an expiry time further ahead than [ValidityWindow]. This ensures anything
 	// added to the [Mempool] is immediately executable.
-	if err := tx.PreExecute(ctx, nextFeeManager, p.balanceHandler, r, view, now); err != nil {
+	if err := tx.PreExecute(ctx, nextFeeManager, p.balanceHandler, r, im, now); err != nil {
 		return err
 	}
 	return nil

diff --git a/chain/pre_executor_test.go b/chain/pre_executor_test.go
@@ -9,10 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ava-labs/avalanchego/database/memdb"
-	"github.com/ava-labs/avalanchego/trace"
 	"github.com/ava-labs/avalanchego/utils/set"
-	"github.com/ava-labs/avalanchego/x/merkledb"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/hypersdk/chain"
@@ -166,21 +163,6 @@ func TestPreExecutor(t *testing.T) {
 			r := require.New(t)
 			ctx := context.Background()
 
-			db, err := merkledb.New(
-				ctx,
-				memdb.New(),
-				merkledb.Config{
-					BranchFactor: merkledb.BranchFactor16,
-					Tracer:       trace.Noop,
-				},
-			)
-			r.NoError(err)
-
-			for k, v := range tt.state {
-				r.NoError(db.Put([]byte(k), v))
-			}
-			r.NoError(db.CommitToDB(ctx))
-
 			preExecutor := chain.NewPreExecutor(
 				&ruleFactory,
 				tt.validityWindow,
@@ -192,7 +174,7 @@ func TestPreExecutor(t *testing.T) {
 				preExecutor.PreExecute(
 					ctx,
 					nil,
-					db,
+					state.ImmutableStorage(tt.state),
 					tt.tx,
 				), tt.err,
 			)