Merge #4175

4175: Misc. delta view cleanup r=pattyshack a=pattyshack



Co-authored-by: Patrick Lee <[email protected]>

Author: bors[bot]

engine/execution/computation/computer/result_collector.go

@@ -77,7 +77,7 @@ type resultCollector struct {
 	blockStats     module.ExecutionResultStats
 
 	currentCollectionStartTime time.Time
-	currentCollectionView      *delta.View
+	currentCollectionView      state.View
 	currentCollectionStats     module.ExecutionResultStats
 }
 

fvm/fvm_test.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/onflow/flow-go/crypto"
 
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/engine/execution/testutil"
 	exeUtils "github.com/onflow/flow-go/engine/execution/utils"
 	"github.com/onflow/flow-go/fvm"
@@ -25,6 +24,7 @@ import (
 	errors "github.com/onflow/flow-go/fvm/errors"
 	"github.com/onflow/flow-go/fvm/meter"
 	reusableRuntime "github.com/onflow/flow-go/fvm/runtime"
+	"github.com/onflow/flow-go/fvm/state"
 	"github.com/onflow/flow-go/fvm/storage"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/utils/unittest"
@@ -1488,15 +1488,15 @@ func TestStorageUsed(t *testing.T) {
 	accountStatusId := flow.AccountStatusRegisterID(
 		flow.BytesToAddress(address))
 
-	simpleView := delta.NewDeltaView(nil)
 	status := environment.NewAccountStatus()
 	status.SetStorageUsed(5)
-	err = simpleView.Set(accountStatusId, status.ToBytes())
-	require.NoError(t, err)
-
-	script := fvm.Script(code)
 
-	_, output, err := vm.RunV2(ctx, script, simpleView)
+	_, output, err := vm.RunV2(
+		ctx,
+		fvm.Script(code),
+		state.MapStorageSnapshot{
+			accountStatusId: status.ToBytes(),
+		})
 	require.NoError(t, err)
 
 	require.Equal(t, cadence.NewUInt64(5), output.Value)

fvm/state/execution_state.go

@@ -21,7 +21,7 @@ const (
 // it holds draft of updates and captures
 // all register touches
 type ExecutionState struct {
-	// NOTE: A finalized view is no longer accessible.  It can however be
+	// NOTE: A finalized state is no longer accessible.  It can however be
 	// re-attached to another transaction and be committed (for cached result
 	// bookkeeping purpose).
 	finalized bool
@@ -144,7 +144,7 @@ func (state *ExecutionState) BytesWritten() uint64 {
 
 func (state *ExecutionState) DropChanges() error {
 	if state.finalized {
-		return fmt.Errorf("cannot DropChanges on a finalized view")
+		return fmt.Errorf("cannot DropChanges on a finalized state")
 	}
 
 	return state.view.DropChanges()
@@ -153,7 +153,7 @@ func (state *ExecutionState) DropChanges() error {
 // Get returns a register value given owner and key
 func (state *ExecutionState) Get(id flow.RegisterID) (flow.RegisterValue, error) {
 	if state.finalized {
-		return nil, fmt.Errorf("cannot Get on a finalized view")
+		return nil, fmt.Errorf("cannot Get on a finalized state")
 	}
 
 	var value []byte
@@ -179,7 +179,7 @@ func (state *ExecutionState) Get(id flow.RegisterID) (flow.RegisterValue, error)
 // Set updates state delta with a register update
 func (state *ExecutionState) Set(id flow.RegisterID, value flow.RegisterValue) error {
 	if state.finalized {
-		return fmt.Errorf("cannot Set on a finalized view")
+		return fmt.Errorf("cannot Set on a finalized state")
 	}
 
 	if state.enforceLimits {
@@ -201,7 +201,7 @@ func (state *ExecutionState) Set(id flow.RegisterID, value flow.RegisterValue) e
 // MeterComputation meters computation usage
 func (state *ExecutionState) MeterComputation(kind common.ComputationKind, intensity uint) error {
 	if state.finalized {
-		return fmt.Errorf("cannot MeterComputation on a finalized view")
+		return fmt.Errorf("cannot MeterComputation on a finalized state")
 	}
 
 	if state.enforceLimits {
@@ -228,7 +228,7 @@ func (state *ExecutionState) TotalComputationLimit() uint {
 // MeterMemory meters memory usage
 func (state *ExecutionState) MeterMemory(kind common.MemoryKind, intensity uint) error {
 	if state.finalized {
-		return fmt.Errorf("cannot MeterMemory on a finalized view")
+		return fmt.Errorf("cannot MeterMemory on a finalized state")
 	}
 
 	if state.enforceLimits {
@@ -255,7 +255,7 @@ func (state *ExecutionState) TotalMemoryLimit() uint {
 
 func (state *ExecutionState) MeterEmittedEvent(byteSize uint64) error {
 	if state.finalized {
-		return fmt.Errorf("cannot MeterEmittedEvent on a finalized view")
+		return fmt.Errorf("cannot MeterEmittedEvent on a finalized state")
 	}
 
 	if state.enforceLimits {
@@ -279,7 +279,7 @@ func (state *ExecutionState) Finalize() *ExecutionSnapshot {
 // MergeState the changes from a the given view to this view.
 func (state *ExecutionState) Merge(other *ExecutionSnapshot) error {
 	if state.finalized {
-		return fmt.Errorf("cannot Merge on a finalized view")
+		return fmt.Errorf("cannot Merge on a finalized state")
 	}
 
 	err := state.view.Merge(other)

fvm/state/transaction_state_test.go

@@ -568,5 +568,5 @@ func TestFinalizeMainTransaction(t *testing.T) {
 
 	// Sanity check state is no longer accessible after FinalizeMainTransaction.
 	_, err = txn.Get(registerId)
-	require.ErrorContains(t, err, "cannot Get on a finalized view")
+	require.ErrorContains(t, err, "cannot Get on a finalized state")
 }