update emulator

Author: peterargue

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/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.

integration/tests/collection/ingress_test.go

@@ -11,7 +11,7 @@ import (
 
 	sdk "github.com/onflow/flow-go-sdk"
 
-	"github.com/onflow/flow-go/access"
+	"github.com/onflow/flow-go/access/validator"
 	"github.com/onflow/flow-go/integration/convert"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/utils/unittest"
@@ -65,7 +65,7 @@ func (suite *IngressSuite) TestTransactionIngress_InvalidTransaction() {
 			tx.SetScript(nil)
 		})
 
-		expected := access.IncompleteTransactionError{
+		expected := validator.IncompleteTransactionError{
 			MissingFields: []string{flow.TransactionFieldScript.String()},
 		}