Remove delta usage from badger interactions

Author: pattyshack

cmd/util/cmd/exec-data-json-export/delta_snapshot_exporter.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	"github.com/onflow/flow-go/cmd/util/cmd/common"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
+	"github.com/onflow/flow-go/fvm/state"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/metrics"
 	"github.com/onflow/flow-go/storage/badger"
@@ -49,7 +49,7 @@ func ExportDeltaSnapshots(blockID flow.Identifier, dbPath string, outputPath str
 			return nil
 		}
 
-		var snap []*delta.Snapshot
+		var snap []*state.ExecutionSnapshot
 		err = db.View(operation.RetrieveExecutionStateInteractions(activeBlockID, &snap))
 		if err != nil {
 			return fmt.Errorf("could not load delta snapshot: %w", err)
@@ -59,13 +59,13 @@ func ExportDeltaSnapshots(blockID flow.Identifier, dbPath string, outputPath str
 			// end of snapshots
 			return nil
 		}
-		m, err := json.Marshal(snap[0].Delta.UpdatedRegisters())
+		m, err := json.Marshal(snap[0].UpdatedRegisters())
 		if err != nil {
 			return fmt.Errorf("could not load delta snapshot: %w", err)
 		}
 
 		reads := make([]string, 0)
-		for _, r := range snap[0].Reads {
+		for _, r := range snap[0].ReadSet {
 
 			json, err := json.Marshal(r)
 			if err != nil {

engine/execution/state/bootstrap/bootstrap.go

@@ -8,8 +8,8 @@ import (
 	"github.com/rs/zerolog"
 
 	"github.com/onflow/flow-go/engine/execution/state"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/fvm"
+	fvmstate "github.com/onflow/flow-go/fvm/state"
 	"github.com/onflow/flow-go/ledger"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/storage"
@@ -113,8 +113,8 @@ func (b *Bootstrapper) BootstrapExecutionDatabase(db *badger.DB, commit flow.Sta
 			return fmt.Errorf("could not index genesis state commitment: %w", err)
 		}
 
-		views := make([]*delta.Snapshot, 0)
-		err = operation.InsertExecutionStateInteractions(genesis.ID(), views)(txn)
+		snapshots := make([]*fvmstate.ExecutionSnapshot, 0)
+		err = operation.InsertExecutionStateInteractions(genesis.ID(), snapshots)(txn)
 		if err != nil {
 			return fmt.Errorf("could not bootstrap execution state interactions: %w", err)
 		}

storage/badger/operation/interactions.go

@@ -1,16 +1,25 @@
 package operation
 
 import (
-	"github.com/onflow/flow-go/engine/execution/state/delta"
+	"github.com/onflow/flow-go/fvm/state"
 	"github.com/onflow/flow-go/model/flow"
 
 	"github.com/dgraph-io/badger/v2"
 )
 
-func InsertExecutionStateInteractions(blockID flow.Identifier, interactions []*delta.Snapshot) func(*badger.Txn) error {
-	return insert(makePrefix(codeExecutionStateInteractions, blockID), interactions)
+func InsertExecutionStateInteractions(
+	blockID flow.Identifier,
+	executionSnapshots []*state.ExecutionSnapshot,
+) func(*badger.Txn) error {
+	return insert(
+		makePrefix(codeExecutionStateInteractions, blockID),
+		executionSnapshots)
 }
 
-func RetrieveExecutionStateInteractions(blockID flow.Identifier, interactions *[]*delta.Snapshot) func(*badger.Txn) error {
-	return retrieve(makePrefix(codeExecutionStateInteractions, blockID), interactions)
+func RetrieveExecutionStateInteractions(
+	blockID flow.Identifier,
+	executionSnapshots *[]*state.ExecutionSnapshot,
+) func(*badger.Txn) error {
+	return retrieve(
+		makePrefix(codeExecutionStateInteractions, blockID), executionSnapshots)
 }

storage/badger/operation/interactions_test.go

@@ -9,52 +9,48 @@ 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/fvm/state"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
 func TestStateInteractionsInsertCheckRetrieve(t *testing.T) {
 	unittest.RunWithBadgerDB(t, func(db *badger.DB) {
 
-		d1 := delta.NewDeltaView(nil)
-
-		d2 := delta.NewDeltaView(nil)
-
 		id1 := flow.NewRegisterID(
 			string([]byte("\x89krg\u007fBN\x1d\xf5\xfb\xb8r\xbc4\xbd\x98ռ\xf1\xd0twU\xbf\x16N\xb4?,\xa0&;")),
 			"")
-
 		id2 := flow.NewRegisterID(string([]byte{2}), "")
 		id3 := flow.NewRegisterID(string([]byte{3}), "")
 
-		// some set and reads
-		err := d1.Set(id1, []byte("zażółć gęślą jaźń"))
-		require.NoError(t, err)
-		err = d1.Set(id2, []byte("b"))
-		require.NoError(t, err)
-		err = d1.Set(id2, []byte("c"))
-		require.NoError(t, err)
-
-		_, err = d1.Get(id2)
-		require.NoError(t, err)
-		_, err = d1.Get(id3)
-		require.NoError(t, err)
-
-		interactions := []*delta.Snapshot{&d1.Interactions().Snapshot, &d2.Interactions().Snapshot}
+		snapshot := &state.ExecutionSnapshot{
+			ReadSet: map[flow.RegisterID]struct{}{
+				id2: struct{}{},
+				id3: struct{}{},
+			},
+			WriteSet: map[flow.RegisterID]flow.RegisterValue{
+				id1: []byte("zażółć gęślą jaźń"),
+				id2: []byte("c"),
+			},
+		}
+
+		interactions := []*state.ExecutionSnapshot{
+			snapshot,
+			&state.ExecutionSnapshot{},
+		}
 
 		blockID := unittest.IdentifierFixture()
 
-		err = db.Update(InsertExecutionStateInteractions(blockID, interactions))
+		err := db.Update(InsertExecutionStateInteractions(blockID, interactions))
 		require.Nil(t, err)
 
-		var readInteractions []*delta.Snapshot
+		var readInteractions []*state.ExecutionSnapshot
 
 		err = db.View(RetrieveExecutionStateInteractions(blockID, &readInteractions))
 		require.NoError(t, err)
 
 		assert.Equal(t, interactions, readInteractions)
-
-		assert.Equal(t, d1.Delta(), d1.Interactions().Delta)
+		assert.Equal(t, snapshot.WriteSet, readInteractions[0].WriteSet)
+		assert.Equal(t, snapshot.ReadSet, readInteractions[0].ReadSet)
 	})
 }