Update emulator

Author: peterargue

integration/internal/emulator/blockchain.go

@@ -45,13 +45,13 @@ import (
 
 	"github.com/onflow/flow-core-contracts/lib/go/templates"
 
-	"github.com/onflow/flow-go/access"
 	"github.com/onflow/flow-go/access/validator"
 	"github.com/onflow/flow-go/engine"
 	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/fvm/environment"
 	fvmerrors "github.com/onflow/flow-go/fvm/errors"
 	reusableRuntime "github.com/onflow/flow-go/fvm/runtime"
+	accessmodel "github.com/onflow/flow-go/model/access"
 	flowgo "github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/metrics"
 )
@@ -174,8 +174,8 @@ func (b *Blockchain) GetChain() flowgo.Chain {
 	return b.vmCtx.Chain
 }
 
-func (b *Blockchain) GetNetworkParameters() access.NetworkParameters {
-	return access.NetworkParameters{
+func (b *Blockchain) GetNetworkParameters() accessmodel.NetworkParameters {
+	return accessmodel.NetworkParameters{
 		ChainID: b.GetChain().ChainID(),
 	}
 }
@@ -381,24 +381,24 @@ func (b *Blockchain) getTransaction(txID flowgo.Identifier) (*flowgo.Transaction
 	return &tx, nil
 }
 
-func (b *Blockchain) GetTransactionResult(txID flowgo.Identifier) (*access.TransactionResult, error) {
+func (b *Blockchain) GetTransactionResult(txID flowgo.Identifier) (*accessmodel.TransactionResult, error) {
 	b.mu.RLock()
 	defer b.mu.RUnlock()
 
 	return b.getTransactionResult(txID)
 }
 
-func (b *Blockchain) getTransactionResult(txID flowgo.Identifier) (*access.TransactionResult, error) {
+func (b *Blockchain) getTransactionResult(txID flowgo.Identifier) (*accessmodel.TransactionResult, error) {
 	if b.pendingBlock.ContainsTransaction(txID) {
-		return &access.TransactionResult{
+		return &accessmodel.TransactionResult{
 			Status: flowgo.TransactionStatusPending,
 		}, nil
 	}
 
 	storedResult, err := b.storage.TransactionResultByID(context.Background(), txID)
 	if err != nil {
 		if errors.Is(err, ErrNotFound) {
-			return &access.TransactionResult{
+			return &accessmodel.TransactionResult{
 				Status: flowgo.TransactionStatusUnknown,
 			}, nil
 		}
@@ -409,7 +409,7 @@ func (b *Blockchain) getTransactionResult(txID flowgo.Identifier) (*access.Trans
 	if storedResult.ErrorCode > 0 {
 		statusCode = 1
 	}
-	result := access.TransactionResult{
+	result := accessmodel.TransactionResult{
 		Status:        flowgo.TransactionStatusSealed,
 		StatusCode:    uint(statusCode),
 		ErrorMessage:  storedResult.ErrorMessage,
@@ -943,7 +943,7 @@ func (b *Blockchain) GetTransactionsByBlockID(blockID flowgo.Identifier) ([]*flo
 	return transactions, nil
 }
 
-func (b *Blockchain) GetTransactionResultsByBlockID(blockID flowgo.Identifier) ([]*access.TransactionResult, error) {
+func (b *Blockchain) GetTransactionResultsByBlockID(blockID flowgo.Identifier) ([]*accessmodel.TransactionResult, error) {
 	b.mu.RLock()
 	defer b.mu.RUnlock()
 
@@ -952,7 +952,7 @@ func (b *Blockchain) GetTransactionResultsByBlockID(blockID flowgo.Identifier) (
 		return nil, fmt.Errorf("failed to get block %s: %w", blockID, err)
 	}
 
-	var results []*access.TransactionResult
+	var results []*accessmodel.TransactionResult
 	for i, guarantee := range block.Payload.Guarantees {
 		c, err := b.getCollectionByID(guarantee.CollectionID)
 		if err != nil {

integration/internal/emulator/convert.go

@@ -26,9 +26,9 @@ import (
 
 	sdk "github.com/onflow/flow-go-sdk"
 
-	"github.com/onflow/flow-go/access"
 	"github.com/onflow/flow-go/fvm"
 	fvmerrors "github.com/onflow/flow-go/fvm/errors"
+	accessmodel "github.com/onflow/flow-go/model/access"
 	flowgo "github.com/onflow/flow-go/model/flow"
 )
 
@@ -159,7 +159,7 @@ func FlowTransactionToSDK(flowTx flowgo.TransactionBody) sdk.Transaction {
 	return transaction
 }
 
-func FlowTransactionResultToSDK(result *access.TransactionResult) (*sdk.TransactionResult, error) {
+func FlowTransactionResultToSDK(result *accessmodel.TransactionResult) (*sdk.TransactionResult, error) {
 
 	events, err := FlowEventsToSDK(result.Events)
 	if err != nil {

integration/internal/emulator/emulator.go

@@ -26,7 +26,7 @@ import (
 	"github.com/onflow/crypto"
 	"github.com/onflow/crypto/hash"
 
-	"github.com/onflow/flow-go/access"
+	accessmodel "github.com/onflow/flow-go/model/access"
 	flowgo "github.com/onflow/flow-go/model/flow"
 )
 
@@ -117,7 +117,7 @@ func (s ServiceKey) AccountKey() (crypto.PublicKey, crypto.PrivateKey) {
 
 type AccessProvider interface {
 	Ping() error
-	GetNetworkParameters() access.NetworkParameters
+	GetNetworkParameters() accessmodel.NetworkParameters
 
 	GetLatestBlock() (*flowgo.Block, error)
 	GetBlockByID(id flowgo.Identifier) (*flowgo.Block, error)
@@ -127,9 +127,9 @@ type AccessProvider interface {
 	GetFullCollectionByID(colID flowgo.Identifier) (*flowgo.Collection, error)
 
 	GetTransaction(txID flowgo.Identifier) (*flowgo.TransactionBody, error)
-	GetTransactionResult(txID flowgo.Identifier) (*access.TransactionResult, error)
+	GetTransactionResult(txID flowgo.Identifier) (*accessmodel.TransactionResult, error)
 	GetTransactionsByBlockID(blockID flowgo.Identifier) ([]*flowgo.TransactionBody, error)
-	GetTransactionResultsByBlockID(blockID flowgo.Identifier) ([]*access.TransactionResult, error)
+	GetTransactionResultsByBlockID(blockID flowgo.Identifier) ([]*accessmodel.TransactionResult, error)
 
 	GetAccount(address flowgo.Address) (*flowgo.Account, error)
 	GetAccountAtBlockHeight(address flowgo.Address, blockHeight uint64) (*flowgo.Account, error)

integration/internal/emulator/errors.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/onflow/flow-go-sdk/crypto"
 
-	"github.com/onflow/flow-go/access"
+	"github.com/onflow/flow-go/access/validator"
 	fvmerrors "github.com/onflow/flow-go/fvm/errors"
 	flowgo "github.com/onflow/flow-go/model/flow"
 )
@@ -260,13 +260,13 @@ func (f *FVMError) Unwrap() error {
 
 func ConvertAccessError(err error) error {
 	switch typedErr := err.(type) {
-	case access.IncompleteTransactionError:
+	case validator.IncompleteTransactionError:
 		return &IncompleteTransactionError{MissingFields: typedErr.MissingFields}
-	case access.ExpiredTransactionError:
+	case validator.ExpiredTransactionError:
 		return &ExpiredTransactionError{RefHeight: typedErr.RefHeight, FinalHeight: typedErr.FinalHeight}
-	case access.InvalidGasLimitError:
+	case validator.InvalidGasLimitError:
 		return &InvalidTransactionGasLimitError{Maximum: typedErr.Maximum, Actual: typedErr.Actual}
-	case access.InvalidScriptError:
+	case validator.InvalidScriptError:
 		return &InvalidTransactionScriptError{ParserErr: typedErr.ParserErr}
 	}
 

integration/internal/emulator/memstore.go

@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/onflow/flow-go/access"
+	"github.com/onflow/flow-go/access/validator"
 	"github.com/onflow/flow-go/fvm/environment"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	flowgo "github.com/onflow/flow-go/model/flow"
@@ -52,7 +52,7 @@ type Store struct {
 }
 
 var _ environment.Blocks = &Store{}
-var _ access.Blocks = &Store{}
+var _ validator.Blocks = &Store{}
 var _ EmulatorStorage = &Store{}
 
 func (b *Store) HeaderByID(id flowgo.Identifier) (*flowgo.Header, error) {

integration/internal/emulator/sdk.go

@@ -16,7 +16,7 @@ import (
 	sdk "github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/templates"
 
-	"github.com/onflow/flow-go/access"
+	accessmodel "github.com/onflow/flow-go/model/access"
 	flowgo "github.com/onflow/flow-go/model/flow"
 )
 
@@ -385,7 +385,7 @@ func (b *SDKAdapter) GetSystemTransaction(_ context.Context, _ flowgo.Identifier
 	return nil, nil
 }
 
-func (b *SDKAdapter) GetSystemTransactionResult(_ context.Context, _ flowgo.Identifier, _ entities.EventEncodingVersion) (*access.TransactionResult, error) {
+func (b *SDKAdapter) GetSystemTransactionResult(_ context.Context, _ flowgo.Identifier, _ entities.EventEncodingVersion) (*accessmodel.TransactionResult, error) {
 	return nil, nil
 }
 

integration/internal/emulator/store.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/psiemens/graceland"
 
-	"github.com/onflow/flow-go/access"
+	"github.com/onflow/flow-go/access/validator"
 	"github.com/onflow/flow-go/fvm/environment"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	flowgo "github.com/onflow/flow-go/model/flow"
@@ -46,7 +46,7 @@ import (
 type EmulatorStorage interface {
 	graceland.Routine
 	environment.Blocks
-	access.Blocks
+	validator.Blocks
 	LatestBlockHeight(ctx context.Context) (uint64, error)
 
 	// LatestBlock returns the block with the highest block height.