Misc state/view usage cleanup

Author: pattyshack

engine/execution/computation/manager_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/onflow/flow-go/engine/execution/computation/computer"
 	"github.com/onflow/flow-go/engine/execution/computation/query"
 	state2 "github.com/onflow/flow-go/engine/execution/state"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	unittest2 "github.com/onflow/flow-go/engine/execution/state/unittest"
 	"github.com/onflow/flow-go/engine/execution/testutil"
 	"github.com/onflow/flow-go/fvm"
@@ -211,17 +210,13 @@ func TestComputeBlock_Uploader(t *testing.T) {
 		derivedChainData: derivedChainData,
 	}
 
-	view := delta.NewDeltaView(
-		state2.NewLedgerStorageSnapshot(
-			ledger,
-			flow.StateCommitment(ledger.InitialState())))
-	blockView := view.NewChild()
-
 	_, err = manager.ComputeBlock(
 		context.Background(),
 		unittest.IdentifierFixture(),
 		computationResult.ExecutableBlock,
-		blockView)
+		state2.NewLedgerStorageSnapshot(
+			ledger,
+			flow.StateCommitment(ledger.InitialState())))
 	require.NoError(t, err)
 }
 
@@ -913,7 +908,8 @@ func TestScriptStorageMutationsDiscarded(t *testing.T) {
 		cadence.NewPath("storage", "x"),
 	)
 
-	// the save should not update account storage by writing the delta from the child view back to the parent
+	// the save should not update account storage by writing the updates
+	// back to the snapshotTree
 	require.NoError(t, err)
 	require.Equal(t, nil, v)
 }

engine/execution/state/state_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/onflow/flow-go/ledger/common/pathfinder"
 
 	"github.com/onflow/flow-go/engine/execution/state"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
+	fvmstate "github.com/onflow/flow-go/fvm/state"
 	ledger "github.com/onflow/flow-go/ledger/complete"
 	"github.com/onflow/flow-go/ledger/complete/wal/fixtures"
 	"github.com/onflow/flow-go/model/flow"
@@ -77,14 +77,14 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		sc1, err := es.StateCommitmentByBlockID(context.Background(), flow.Identifier{})
 		assert.NoError(t, err)
 
-		view1 := delta.NewDeltaView(es.NewStorageSnapshot(sc1))
+		executionSnapshot := &fvmstate.ExecutionSnapshot{
+			WriteSet: map[flow.RegisterID]flow.RegisterValue{
+				registerID1: flow.RegisterValue("apple"),
+				registerID2: flow.RegisterValue("carrot"),
+			},
+		}
 
-		err = view1.Set(registerID1, flow.RegisterValue("apple"))
-		assert.NoError(t, err)
-		err = view1.Set(registerID2, flow.RegisterValue("carrot"))
-		assert.NoError(t, err)
-
-		sc2, update, err := state.CommitDelta(l, view1.Finalize(), sc1)
+		sc2, update, err := state.CommitDelta(l, executionSnapshot, sc1)
 		assert.NoError(t, err)
 
 		assert.Equal(t, sc1[:], update.RootHash[:])
@@ -122,11 +122,11 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		assert.Equal(t, []byte("apple"), []byte(update.Payloads[0].Value()))
 		assert.Equal(t, []byte("carrot"), []byte(update.Payloads[1].Value()))
 
-		view2 := delta.NewDeltaView(es.NewStorageSnapshot(sc2))
+		storageSnapshot := es.NewStorageSnapshot(sc2)
 
-		b1, err := view2.Get(registerID1)
+		b1, err := storageSnapshot.Get(registerID1)
 		assert.NoError(t, err)
-		b2, err := view2.Get(registerID2)
+		b2, err := storageSnapshot.Get(registerID2)
 		assert.NoError(t, err)
 
 		assert.Equal(t, flow.RegisterValue("apple"), b1)
@@ -138,32 +138,36 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		sc1, err := es.StateCommitmentByBlockID(context.Background(), flow.Identifier{})
 		assert.NoError(t, err)
 
-		view1 := delta.NewDeltaView(es.NewStorageSnapshot(sc1))
+		executionSnapshot1 := &fvmstate.ExecutionSnapshot{
+			WriteSet: map[flow.RegisterID]flow.RegisterValue{
+				registerID1: []byte("apple"),
+			},
+		}
 
-		err = view1.Set(registerID1, []byte("apple"))
-		assert.NoError(t, err)
-		sc2, _, err := state.CommitDelta(l, view1.Finalize(), sc1)
+		sc2, _, err := state.CommitDelta(l, executionSnapshot1, sc1)
 		assert.NoError(t, err)
 
 		// update value and get resulting state commitment
-		view2 := delta.NewDeltaView(es.NewStorageSnapshot(sc2))
-		err = view2.Set(registerID1, []byte("orange"))
-		assert.NoError(t, err)
+		executionSnapshot2 := &fvmstate.ExecutionSnapshot{
+			WriteSet: map[flow.RegisterID]flow.RegisterValue{
+				registerID1: []byte("orange"),
+			},
+		}
 
-		sc3, _, err := state.CommitDelta(l, view2.Finalize(), sc2)
+		sc3, _, err := state.CommitDelta(l, executionSnapshot2, sc2)
 		assert.NoError(t, err)
 
 		// create a view for previous state version
-		view3 := delta.NewDeltaView(es.NewStorageSnapshot(sc2))
+		storageSnapshot3 := es.NewStorageSnapshot(sc2)
 
 		// create a view for new state version
-		view4 := delta.NewDeltaView(es.NewStorageSnapshot(sc3))
+		storageSnapshot4 := es.NewStorageSnapshot(sc3)
 
 		// fetch the value at both versions
-		b1, err := view3.Get(registerID1)
+		b1, err := storageSnapshot3.Get(registerID1)
 		assert.NoError(t, err)
 
-		b2, err := view4.Get(registerID1)
+		b2, err := storageSnapshot4.Get(registerID1)
 		assert.NoError(t, err)
 
 		assert.Equal(t, flow.RegisterValue("apple"), b1)
@@ -176,34 +180,37 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		assert.NoError(t, err)
 
 		// set initial value
-		view1 := delta.NewDeltaView(es.NewStorageSnapshot(sc1))
-		err = view1.Set(registerID1, []byte("apple"))
-		assert.NoError(t, err)
-		err = view1.Set(registerID2, []byte("apple"))
-		assert.NoError(t, err)
+		executionSnapshot1 := &fvmstate.ExecutionSnapshot{
+			WriteSet: map[flow.RegisterID]flow.RegisterValue{
+				registerID1: []byte("apple"),
+				registerID2: []byte("apple"),
+			},
+		}
 
-		sc2, _, err := state.CommitDelta(l, view1.Finalize(), sc1)
+		sc2, _, err := state.CommitDelta(l, executionSnapshot1, sc1)
 		assert.NoError(t, err)
 
 		// update value and get resulting state commitment
-		view2 := delta.NewDeltaView(es.NewStorageSnapshot(sc2))
-		err = view2.Set(registerID1, nil)
-		assert.NoError(t, err)
+		executionSnapshot2 := &fvmstate.ExecutionSnapshot{
+			WriteSet: map[flow.RegisterID]flow.RegisterValue{
+				registerID1: nil,
+			},
+		}
 
-		sc3, _, err := state.CommitDelta(l, view2.Finalize(), sc2)
+		sc3, _, err := state.CommitDelta(l, executionSnapshot2, sc2)
 		assert.NoError(t, err)
 
 		// create a view for previous state version
-		view3 := delta.NewDeltaView(es.NewStorageSnapshot(sc2))
+		storageSnapshot3 := es.NewStorageSnapshot(sc2)
 
 		// create a view for new state version
-		view4 := delta.NewDeltaView(es.NewStorageSnapshot(sc3))
+		storageSnapshot4 := es.NewStorageSnapshot(sc3)
 
 		// fetch the value at both versions
-		b1, err := view3.Get(registerID1)
+		b1, err := storageSnapshot3.Get(registerID1)
 		assert.NoError(t, err)
 
-		b2, err := view4.Get(registerID1)
+		b2, err := storageSnapshot4.Get(registerID1)
 		assert.NoError(t, err)
 
 		assert.Equal(t, flow.RegisterValue("apple"), b1)
@@ -216,17 +223,18 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		assert.NoError(t, err)
 
 		// set initial value
-		view1 := delta.NewDeltaView(es.NewStorageSnapshot(sc1))
-		err = view1.Set(registerID1, flow.RegisterValue("apple"))
-		assert.NoError(t, err)
-		err = view1.Set(registerID2, flow.RegisterValue("apple"))
-		assert.NoError(t, err)
+		executionSnapshot1 := &fvmstate.ExecutionSnapshot{
+			WriteSet: map[flow.RegisterID]flow.RegisterValue{
+				registerID1: flow.RegisterValue("apple"),
+				registerID2: flow.RegisterValue("apple"),
+			},
+		}
 
-		sc2, _, err := state.CommitDelta(l, view1.Finalize(), sc1)
+		sc2, _, err := state.CommitDelta(l, executionSnapshot1, sc1)
 		assert.NoError(t, err)
 
 		// committing for the second time should be OK
-		sc2Same, _, err := state.CommitDelta(l, view1.Finalize(), sc1)
+		sc2Same, _, err := state.CommitDelta(l, executionSnapshot1, sc1)
 		assert.NoError(t, err)
 
 		require.Equal(t, sc2, sc2Same)

fvm/derived/table_test.go

@@ -1089,7 +1089,10 @@ func TestDerivedDataTableGetOrCompute(t *testing.T) {
 		assert.Equal(t, value, val)
 		assert.True(t, computer.called)
 
-		_, found := view.Finalize().ReadSet[key]
+		snapshot, err := txnState.FinalizeMainTransaction()
+		assert.NoError(t, err)
+
+		_, found := snapshot.ReadSet[key]
 		assert.True(t, found)
 
 		// Commit to setup the next test.
@@ -1112,7 +1115,10 @@ func TestDerivedDataTableGetOrCompute(t *testing.T) {
 		assert.Equal(t, value, val)
 		assert.False(t, computer.called)
 
-		_, found := view.Finalize().ReadSet[key]
+		snapshot, err := txnState.FinalizeMainTransaction()
+		assert.NoError(t, err)
+
+		_, found := snapshot.ReadSet[key]
 		assert.True(t, found)
 	})
 }

fvm/environment/accounts_test.go

@@ -23,8 +23,11 @@ func TestAccounts_Create(t *testing.T) {
 		err := accounts.Create(nil, address)
 		require.NoError(t, err)
 
+		snapshot, err := txnState.FinalizeMainTransaction()
+		require.NoError(t, err)
+
 		// account status
-		require.Equal(t, len(txnState.Finalize().AllRegisterIDs()), 1)
+		require.Equal(t, len(snapshot.AllRegisterIDs()), 1)
 	})
 
 	t.Run("Fails if account exists", func(t *testing.T) {

fvm/environment/derived_data_invalidator_test.go

@@ -301,7 +301,7 @@ func TestMeterParamOverridesUpdated(t *testing.T) {
 		require.Equal(t, expected, invalidator.MeterParamOverridesUpdated)
 	}
 
-	executionSnapshot, err = nestedTxn.FinalizeMainTransaction()
+	executionSnapshot, err = txnState.FinalizeMainTransaction()
 	require.NoError(t, err)
 
 	for _, registerId := range executionSnapshot.AllRegisterIDs() {

fvm/state/execution_state_test.go

@@ -130,7 +130,7 @@ func TestExecutionState_ChildMergeFunctionality(t *testing.T) {
 		require.NoError(t, err)
 
 		// now should be part of the ledger
-		v, err := view.Get(key)
+		v, err := st.Get(key)
 		require.NoError(t, err)
 		require.Equal(t, v, value)
 	})

fvm/storage/testutils/utils.go

@@ -7,32 +7,21 @@ import (
 	"github.com/onflow/flow-go/fvm/storage"
 )
 
-type SimpleTestTransaction struct {
-	*delta.View
-
-	storage.SerialTransaction
-}
-
 // NewSimpleTransaction returns a transaction which can be used to test
 // fvm evaluation.  The returned transaction should not be committed.
 func NewSimpleTransaction(
 	snapshot state.StorageSnapshot,
-) *SimpleTestTransaction {
-	view := delta.NewDeltaView(snapshot)
-
+) *storage.SerialTransaction {
 	derivedBlockData := derived.NewEmptyDerivedBlockData()
 	derivedTxnData, err := derivedBlockData.NewDerivedTransactionData(0, 0)
 	if err != nil {
 		panic(err)
 	}
 
-	return &SimpleTestTransaction{
-		View: view,
-		SerialTransaction: storage.SerialTransaction{
-			NestedTransaction: state.NewTransactionState(
-				view,
-				state.DefaultParameters()),
-			DerivedTransactionCommitter: derivedTxnData,
-		},
+	return &storage.SerialTransaction{
+		NestedTransaction: state.NewTransactionState(
+			delta.NewDeltaView(snapshot),
+			state.DefaultParameters()),
+		DerivedTransactionCommitter: derivedTxnData,
 	}
 }