Merge #4064

4064: Update fvm GetAccount to use StorageSnapshot as input r=pattyshack a=pattyshack



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

Author: bors[bot]

engine/execution/computation/manager_test.go

@@ -519,9 +519,9 @@ func (p *PanickingVM) Run(f fvm.Context, procedure fvm.Procedure, view state.Vie
 }
 
 func (p *PanickingVM) GetAccount(
-	f fvm.Context,
+	ctx fvm.Context,
 	address flow.Address,
-	view state.View,
+	storageSnapshot state.StorageSnapshot,
 ) (
 	*flow.Account,
 	error,
@@ -560,9 +560,9 @@ func (l *LongRunningVM) Run(f fvm.Context, procedure fvm.Procedure, view state.V
 }
 
 func (l *LongRunningVM) GetAccount(
-	f fvm.Context,
+	ctx fvm.Context,
 	address flow.Address,
-	view state.View,
+	storageSnapshot state.StorageSnapshot,
 ) (
 	*flow.Account,
 	error,

engine/execution/computation/query/executor.go

@@ -225,7 +225,7 @@ func (e *QueryExecutor) GetAccount(
 	account, err := e.vm.GetAccount(
 		blockCtx,
 		address,
-		delta.NewDeltaView(snapshot))
+		snapshot)
 	if err != nil {
 		return nil, fmt.Errorf(
 			"failed to get account (%s) at block (%s): %w",

fvm/fvm.go

@@ -122,7 +122,7 @@ type VM interface {
 	)
 
 	Run(Context, Procedure, state.View) error
-	GetAccount(Context, flow.Address, state.View) (*flow.Account, error)
+	GetAccount(Context, flow.Address, state.StorageSnapshot) (*flow.Account, error)
 }
 
 var _ VM = (*VirtualMachine)(nil)
@@ -235,13 +235,14 @@ func (vm *VirtualMachine) Run(
 func (vm *VirtualMachine) GetAccount(
 	ctx Context,
 	address flow.Address,
-	v state.View,
+	storageSnapshot state.StorageSnapshot,
 ) (
 	*flow.Account,
 	error,
 ) {
 	nestedTxn := state.NewTransactionState(
-		v,
+		// TODO(patrick): initialize view inside TransactionState
+		delta.NewDeltaView(storageSnapshot),
 		state.DefaultParameters().
 			WithMaxKeySizeAllowed(ctx.MaxStateKeySize).
 			WithMaxValueSizeAllowed(ctx.MaxStateValueSize).

fvm/mock/vm.go

@@ -426,7 +426,13 @@ func (vm *vmMock) Run(ctx fvm.Context, proc fvm.Procedure, led state.View) error
 	return nil
 }
 
-func (vmMock) GetAccount(_ fvm.Context, _ flow.Address, _ state.View) (*flow.Account, error) {
+func (vmMock) GetAccount(
+	_ fvm.Context,
+	_ flow.Address,
+	_ state.StorageSnapshot,
+) (
+	*flow.Account,
+	error) {
 	panic("not expected")
 }
 
@@ -483,7 +489,14 @@ func (vm *vmSystemOkMock) Run(ctx fvm.Context, proc fvm.Procedure, led state.Vie
 	return nil
 }
 
-func (vmSystemOkMock) GetAccount(_ fvm.Context, _ flow.Address, _ state.View) (*flow.Account, error) {
+func (vmSystemOkMock) GetAccount(
+	_ fvm.Context,
+	_ flow.Address,
+	_ state.StorageSnapshot,
+) (
+	*flow.Account,
+	error,
+) {
 	panic("not expected")
 }
 
@@ -528,6 +541,13 @@ func (vm *vmSystemBadMock) Run(ctx fvm.Context, proc fvm.Procedure, led state.Vi
 	return nil
 }
 
-func (vmSystemBadMock) GetAccount(_ fvm.Context, _ flow.Address, _ state.View) (*flow.Account, error) {
+func (vmSystemBadMock) GetAccount(
+	_ fvm.Context,
+	_ flow.Address,
+	_ state.StorageSnapshot,
+) (
+	*flow.Account,
+	error,
+) {
 	panic("not expected")
 }