Remove unnecessary delta view usage in tests

Author: pattyshack

engine/execution/computation/committer/committer_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/onflow/flow-go/engine/execution/computation/committer"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
+	"github.com/onflow/flow-go/fvm/state"
 	led "github.com/onflow/flow-go/ledger"
 	ledgermock "github.com/onflow/flow-go/ledger/mock"
 	"github.com/onflow/flow-go/model/flow"
@@ -33,16 +33,12 @@ func TestLedgerViewCommitter(t *testing.T) {
 			Return(expectedProof, nil).
 			Once()
 
-		view := delta.NewDeltaView(nil)
-
-		err := view.Set(
-			flow.NewRegisterID("owner", "key"),
-			[]byte{1},
-		)
-		require.NoError(t, err)
-
 		newState, proof, _, err := com.CommitView(
-			view.Finalize(),
+			&state.ExecutionSnapshot{
+				WriteSet: map[flow.RegisterID]flow.RegisterValue{
+					flow.NewRegisterID("owner", "key"): []byte{1},
+				},
+			},
 			utils.StateCommitmentFixture())
 		require.NoError(t, err)
 		require.Equal(t, flow.StateCommitment(expectedStateCommitment), newState)

engine/execution/computation/computer/computer_test.go

@@ -35,6 +35,7 @@ import (
 	fvmmock "github.com/onflow/flow-go/fvm/mock"
 	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/fvm/storage/testutils"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/ledger"
@@ -362,15 +363,20 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 
 		opts := append(baseOpts, contextOptions...)
 		ctx := fvm.NewContext(opts...)
-		view := delta.NewDeltaView(nil)
+		snapshotTree := storage.NewSnapshotTree(nil)
 
 		baseBootstrapOpts := []fvm.BootstrapProcedureOption{
 			fvm.WithInitialTokenSupply(unittest.GenesisTokenSupply),
 		}
 		bootstrapOpts := append(baseBootstrapOpts, bootstrapOptions...)
-		err := vm.Run(ctx, fvm.Bootstrap(unittest.ServiceAccountPublicKey, bootstrapOpts...), view)
+		executionSnapshot, _, err := vm.RunV2(
+			ctx,
+			fvm.Bootstrap(unittest.ServiceAccountPublicKey, bootstrapOpts...),
+			snapshotTree)
 		require.NoError(t, err)
 
+		snapshotTree = snapshotTree.Append(executionSnapshot)
+
 		comm := new(computermock.ViewCommitter)
 
 		bservice := requesterunit.MockBlobService(blockstore.NewBlockstore(dssync.MutexWrap(datastore.NewMapDatastore())))
@@ -407,7 +413,7 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 			context.Background(),
 			unittest.IdentifierFixture(),
 			block,
-			view,
+			snapshotTree,
 			derivedBlockData)
 		assert.NoError(t, err)
 		assert.Len(t, result.StateSnapshots, 1)
@@ -718,18 +724,15 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 		const transactionCount = 2
 		block := generateBlock(collectionCount, transactionCount, rag)
 
-		view := delta.NewDeltaView(nil)
-
-		err = view.Set(
-			flow.AccountStatusRegisterID(flow.BytesToAddress(address.Bytes())),
-			environment.NewAccountStatus().ToBytes())
-		require.NoError(t, err)
+		key := flow.AccountStatusRegisterID(
+			flow.BytesToAddress(address.Bytes()))
+		value := environment.NewAccountStatus().ToBytes()
 
 		result, err := exe.ExecuteBlock(
 			context.Background(),
 			unittest.IdentifierFixture(),
 			block,
-			view,
+			state.MapStorageSnapshot{key: value},
 			derived.NewEmptyDerivedBlockData())
 		assert.NoError(t, err)
 		assert.Len(t, result.StateSnapshots, collectionCount+1) // +1 system chunk
@@ -818,18 +821,15 @@ func TestBlockExecutor_ExecuteBlock(t *testing.T) {
 
 		block := generateBlock(collectionCount, transactionCount, rag)
 
-		view := delta.NewDeltaView(nil)
-
-		err = view.Set(
-			flow.AccountStatusRegisterID(flow.BytesToAddress(address.Bytes())),
-			environment.NewAccountStatus().ToBytes())
-		require.NoError(t, err)
+		key := flow.AccountStatusRegisterID(
+			flow.BytesToAddress(address.Bytes()))
+		value := environment.NewAccountStatus().ToBytes()
 
 		result, err := exe.ExecuteBlock(
 			context.Background(),
 			unittest.IdentifierFixture(),
 			block,
-			view,
+			state.MapStorageSnapshot{key: value},
 			derived.NewEmptyDerivedBlockData())
 		require.NoError(t, err)
 		assert.Len(t, result.StateSnapshots, collectionCount+1) // +1 system chunk
@@ -1154,13 +1154,11 @@ func Test_ExecutingSystemCollection(t *testing.T) {
 	// create empty block, it will have system collection attached while executing
 	block := generateBlock(0, 0, rag)
 
-	view := delta.NewDeltaView(ledger)
-
 	result, err := exe.ExecuteBlock(
 		context.Background(),
 		unittest.IdentifierFixture(),
 		block,
-		view,
+		ledger,
 		derived.NewEmptyDerivedBlockData())
 	assert.NoError(t, err)
 	assert.Len(t, result.StateSnapshots, 1) // +1 system chunk

fvm/accounts_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/engine/execution/testutil"
 	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/fvm/state"
@@ -1375,13 +1374,12 @@ func TestAccountBalanceFields(t *testing.T) {
 					}
 				`, address)))
 
-				view = delta.NewDeltaView(
-					errorOnAddressSnapshotWrapper{
-						view:  view,
-						owner: address,
-					})
+				snapshot := errorOnAddressSnapshotWrapper{
+					view:  view,
+					owner: address,
+				}
 
-				_, _, err := vm.RunV2(ctx, script, view)
+				_, _, err := vm.RunV2(ctx, script, snapshot)
 				require.ErrorContains(
 					t,
 					err,

ledger/partial/ledger_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	executionState "github.com/onflow/flow-go/engine/execution/state"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/ledger"
 	"github.com/onflow/flow-go/ledger/common/testutils"
 	"github.com/onflow/flow-go/ledger/complete"
@@ -119,27 +118,16 @@ func TestProofsForEmptyRegisters(t *testing.T) {
 	// create empty update
 	emptyState := l.InitialState()
 
-	view := delta.NewDeltaView(
-		executionState.NewLedgerStorageSnapshot(
-			l,
-			flow.StateCommitment(emptyState)))
-
-	registerID := flow.NewRegisterID("b", "nk")
-
-	v, err := view.Get(registerID)
-	require.NoError(t, err)
-	require.Empty(t, v)
-
-	keys, values := executionState.RegisterEntriesToKeysValues(
-		view.Delta().UpdatedRegisters())
+	// No updates.
+	keys, values := executionState.RegisterEntriesToKeysValues(nil)
 
 	updated, err := ledger.NewUpdate(emptyState, keys, values)
 	require.NoError(t, err)
 
-	allRegisters := view.Interactions().AllRegisterIDs()
-	allKeys := make([]ledger.Key, len(allRegisters))
-	for i, id := range allRegisters {
-		allKeys[i] = executionState.RegisterIDToKey(id)
+	// Read one register during execution.
+	registerID := flow.NewRegisterID("b", "nk")
+	allKeys := []ledger.Key{
+		executionState.RegisterIDToKey(registerID),
 	}
 
 	newState := updated.State()