Update computation/testutils to use fvm.RunV2 / snapshot tree

Author: pattyshack

engine/execution/computation/manager_benchmark_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/fvm/derived"
 	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/module/executiondatasync/execution_data"
 	exedataprovider "github.com/onflow/flow-go/module/executiondatasync/provider"
@@ -44,13 +44,21 @@ type testAccounts struct {
 	seq      uint64
 }
 
-func createAccounts(b *testing.B, vm fvm.VM, ledger state.View, num int) *testAccounts {
+func createAccounts(
+	b *testing.B,
+	vm fvm.VM,
+	snapshotTree storage.SnapshotTree,
+	num int,
+) (
+	storage.SnapshotTree,
+	*testAccounts,
+) {
 	privateKeys, err := testutil.GenerateAccountPrivateKeys(num)
 	require.NoError(b, err)
 
-	addresses, err := testutil.CreateAccounts(
+	snapshotTree, addresses, err := testutil.CreateAccounts(
 		vm,
-		ledger,
+		snapshotTree,
 		privateKeys,
 		chain)
 	require.NoError(b, err)
@@ -64,16 +72,16 @@ func createAccounts(b *testing.B, vm fvm.VM, ledger state.View, num int) *testAc
 			privateKey: privateKeys[i],
 		}
 	}
-	return accs
+	return snapshotTree, accs
 }
 
 func mustFundAccounts(
 	b *testing.B,
 	vm fvm.VM,
-	ledger state.View,
+	snapshotTree storage.SnapshotTree,
 	execCtx fvm.Context,
 	accs *testAccounts,
-) {
+) storage.SnapshotTree {
 	derivedBlockData := derived.NewEmptyDerivedBlockData()
 	execCtx = fvm.NewContextFromParent(
 		execCtx,
@@ -89,10 +97,13 @@ func mustFundAccounts(
 		tx := fvm.Transaction(
 			transferTx,
 			derivedBlockData.NextTxIndexForTestingOnly())
-		err = vm.Run(execCtx, tx, ledger)
+		executionSnapshot, output, err := vm.RunV2(execCtx, tx, snapshotTree)
 		require.NoError(b, err)
-		require.NoError(b, tx.Err)
+		require.NoError(b, output.Err)
+		snapshotTree = snapshotTree.Append(executionSnapshot)
 	}
+
+	return snapshotTree
 }
 
 func BenchmarkComputeBlock(b *testing.B) {
@@ -115,16 +126,16 @@ func BenchmarkComputeBlock(b *testing.B) {
 				runtime.Config{},
 			)),
 	)
-	ledger := testutil.RootBootstrappedLedger(
+	snapshotTree := testutil.RootBootstrappedLedger(
 		vm,
 		execCtx,
 		fvm.WithAccountCreationFee(fvm.DefaultAccountCreationFee),
 		fvm.WithMinimumStorageReservation(fvm.DefaultMinimumStorageReservation),
 		fvm.WithTransactionFee(fvm.DefaultTransactionFees),
 		fvm.WithStorageMBPerFLOW(fvm.DefaultStorageMBPerFLOW),
 	)
-	accs := createAccounts(b, vm, ledger, 1000)
-	mustFundAccounts(b, vm, ledger, execCtx, accs)
+	snapshotTree, accs := createAccounts(b, vm, snapshotTree, 1000)
+	snapshotTree = mustFundAccounts(b, vm, snapshotTree, execCtx, accs)
 
 	me := new(module.Local)
 	me.On("NodeID").Return(flow.ZeroID)
@@ -192,13 +203,12 @@ func BenchmarkComputeBlock(b *testing.B) {
 				context.Background(),
 				unittest.IdentifierFixture(),
 				executableBlock,
-				ledger)
+				snapshotTree)
 			elapsed += time.Since(start)
 			b.StopTimer()
 
 			for _, snapshot := range res.StateSnapshots {
-				err := ledger.Merge(snapshot)
-				require.NoError(b, err)
+				snapshotTree = snapshotTree.Append(snapshot)
 			}
 
 			require.NoError(b, err)

engine/execution/computation/manager_test.go

@@ -58,8 +58,11 @@ func TestComputeBlockWithStorage(t *testing.T) {
 	privateKeys, err := testutil.GenerateAccountPrivateKeys(2)
 	require.NoError(t, err)
 
-	ledger := testutil.RootBootstrappedLedger(vm, execCtx)
-	accounts, err := testutil.CreateAccounts(vm, ledger, privateKeys, chain)
+	snapshotTree, accounts, err := testutil.CreateAccounts(
+		vm,
+		testutil.RootBootstrappedLedger(vm, execCtx),
+		privateKeys,
+		chain)
 	require.NoError(t, err)
 
 	tx1 := testutil.DeployCounterContractTransaction(accounts[0], chain)
@@ -150,17 +153,21 @@ func TestComputeBlockWithStorage(t *testing.T) {
 		derivedChainData: derivedChainData,
 	}
 
-	view := delta.NewDeltaView(ledger)
-	blockView := view.NewChild()
-
 	returnedComputationResult, err := engine.ComputeBlock(
 		context.Background(),
 		unittest.IdentifierFixture(),
 		executableBlock,
-		blockView)
+		snapshotTree)
 	require.NoError(t, err)
 
-	require.NotEmpty(t, blockView.(*delta.View).Delta())
+	hasUpdates := false
+	for _, snapshot := range returnedComputationResult.StateSnapshots {
+		if len(snapshot.WriteSet) > 0 {
+			hasUpdates = true
+			break
+		}
+	}
+	require.True(t, hasUpdates)
 	require.Len(t, returnedComputationResult.StateSnapshots, 1+1) // 1 coll + 1 system chunk
 	assert.NotEmpty(t, returnedComputationResult.StateSnapshots[0].UpdatedRegisters())
 }
@@ -703,8 +710,11 @@ func Test_EventEncodingFailsOnlyTxAndCarriesOn(t *testing.T) {
 
 	privateKeys, err := testutil.GenerateAccountPrivateKeys(1)
 	require.NoError(t, err)
-	ledger := testutil.RootBootstrappedLedger(vm, execCtx)
-	accounts, err := testutil.CreateAccounts(vm, ledger, privateKeys, chain)
+	snapshotTree, accounts, err := testutil.CreateAccounts(
+		vm,
+		testutil.RootBootstrappedLedger(vm, execCtx),
+		privateKeys,
+		chain)
 	require.NoError(t, err)
 
 	// setup transactions
@@ -789,16 +799,13 @@ func Test_EventEncodingFailsOnlyTxAndCarriesOn(t *testing.T) {
 		derivedChainData: derivedChainData,
 	}
 
-	view := delta.NewDeltaView(ledger)
-	blockView := view.NewChild()
-
 	eventEncoder.enabled = true
 
 	returnedComputationResult, err := engine.ComputeBlock(
 		context.Background(),
 		unittest.IdentifierFixture(),
 		executableBlock,
-		blockView)
+		snapshotTree)
 	require.NoError(t, err)
 
 	require.Len(t, returnedComputationResult.Events, 2)             // 1 collection + 1 system chunk
@@ -858,14 +865,18 @@ func TestScriptStorageMutationsDiscarded(t *testing.T) {
 		},
 	)
 	vm := manager.vm
-	view := testutil.RootBootstrappedLedger(vm, ctx)
 
 	// Create an account private key.
 	privateKeys, err := testutil.GenerateAccountPrivateKeys(1)
 	require.NoError(t, err)
 
-	// Bootstrap a ledger, creating accounts with the provided private keys and the root account.
-	accounts, err := testutil.CreateAccounts(vm, view, privateKeys, chain)
+	// Bootstrap a ledger, creating accounts with the provided private keys
+	// and the root account.
+	snapshotTree, accounts, err := testutil.CreateAccounts(
+		vm,
+		testutil.RootBootstrappedLedger(vm, ctx),
+		privateKeys,
+		chain)
 	require.NoError(t, err)
 	account := accounts[0]
 	address := cadence.NewAddress(account)
@@ -884,13 +895,13 @@ func TestScriptStorageMutationsDiscarded(t *testing.T) {
 		script,
 		[][]byte{jsoncdc.MustEncode(address)},
 		header,
-		view)
+		snapshotTree)
 
 	require.NoError(t, err)
 
 	env := environment.NewScriptEnvironmentFromStorageSnapshot(
 		ctx.EnvironmentParams,
-		view)
+		snapshotTree)
 
 	rt := env.BorrowCadenceRuntime()
 	defer env.ReturnCadenceRuntime(rt)