Merge #4163

4163: clean up engine/execution/state tests delta usage r=pattyshack a=pattyshack



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

Author: bors[bot]

engine/execution/state/mock/view_committer.go

@@ -84,7 +84,7 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		err = view1.Set(registerID2, flow.RegisterValue("carrot"))
 		assert.NoError(t, err)
 
-		sc2, update, err := state.CommitDelta(l, view1.Delta(), sc1)
+		sc2, update, err := state.CommitDelta(l, view1.Finalize(), sc1)
 		assert.NoError(t, err)
 
 		assert.Equal(t, sc1[:], update.RootHash[:])
@@ -142,15 +142,15 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 
 		err = view1.Set(registerID1, []byte("apple"))
 		assert.NoError(t, err)
-		sc2, _, err := state.CommitDelta(l, view1.Delta(), sc1)
+		sc2, _, err := state.CommitDelta(l, view1.Finalize(), 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)
 
-		sc3, _, err := state.CommitDelta(l, view2.Delta(), sc2)
+		sc3, _, err := state.CommitDelta(l, view2.Finalize(), sc2)
 		assert.NoError(t, err)
 
 		// create a view for previous state version
@@ -182,15 +182,15 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		err = view1.Set(registerID2, []byte("apple"))
 		assert.NoError(t, err)
 
-		sc2, _, err := state.CommitDelta(l, view1.Delta(), sc1)
+		sc2, _, err := state.CommitDelta(l, view1.Finalize(), 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)
 
-		sc3, _, err := state.CommitDelta(l, view2.Delta(), sc2)
+		sc3, _, err := state.CommitDelta(l, view2.Finalize(), sc2)
 		assert.NoError(t, err)
 
 		// create a view for previous state version
@@ -222,11 +222,11 @@ func TestExecutionStateWithTrieStorage(t *testing.T) {
 		err = view1.Set(registerID2, flow.RegisterValue("apple"))
 		assert.NoError(t, err)
 
-		sc2, _, err := state.CommitDelta(l, view1.Delta(), sc1)
+		sc2, _, err := state.CommitDelta(l, view1.Finalize(), sc1)
 		assert.NoError(t, err)
 
 		// committing for the second time should be OK
-		sc2Same, _, err := state.CommitDelta(l, view1.Delta(), sc1)
+		sc2Same, _, err := state.CommitDelta(l, view1.Finalize(), sc1)
 		assert.NoError(t, err)
 
 		require.Equal(t, sc2, sc2Same)