update expected ErrNotFound to ErrUnknownSnapshotReference

Author: jordanschalm

access/validator.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 
 	"github.com/onflow/flow-go/crypto"
+	"github.com/onflow/flow-go/state"
 
 	"github.com/onflow/cadence/runtime/parser"
 
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/state/protocol"
-	"github.com/onflow/flow-go/storage"
 )
 
 type Blocks interface {
@@ -29,7 +29,7 @@ func NewProtocolStateBlocks(state protocol.State) *ProtocolStateBlocks {
 func (b *ProtocolStateBlocks) HeaderByID(id flow.Identifier) (*flow.Header, error) {
 	header, err := b.state.AtBlockID(id).Head()
 	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
+		if errors.Is(err, state.ErrUnknownSnapshotReference) {
 			return nil, nil
 		}
 

engine/consensus/ingestion/core.go

@@ -18,6 +18,7 @@ import (
 	"github.com/onflow/flow-go/module/metrics"
 	"github.com/onflow/flow-go/module/signature"
 	"github.com/onflow/flow-go/module/trace"
+	"github.com/onflow/flow-go/state"
 	"github.com/onflow/flow-go/state/protocol"
 	"github.com/onflow/flow-go/storage"
 )
@@ -158,7 +159,7 @@ func (e *Core) validateGuarantors(guarantee *flow.CollectionGuarantee) error {
 	snapshot := e.state.AtBlockID(guarantee.ReferenceBlockID)
 	cluster, err := snapshot.Epochs().Current().ClusterByChainID(guarantee.ChainID)
 	// reference block not found
-	if errors.Is(err, storage.ErrNotFound) {
+	if errors.Is(err, state.ErrUnknownSnapshotReference) {
 		return engine.NewUnverifiableInputError(
 			"could not get clusters with chainID %v for unknown reference block (id=%x): %w", guarantee.ChainID, guarantee.ReferenceBlockID, err)
 	}
@@ -212,7 +213,7 @@ func (e *Core) validateOrigin(originID flow.Identifier, guarantee *flow.Collecti
 	valid, err := protocol.IsNodeAuthorizedWithRoleAt(refState, originID, flow.RoleCollection)
 	if err != nil {
 		// collection with an unknown reference block is unverifiable
-		if errors.Is(err, storage.ErrNotFound) {
+		if errors.Is(err, state.ErrUnknownSnapshotReference) {
 			return engine.NewUnverifiableInputError("could not get origin (id=%x) for unknown reference block (id=%x): %w", originID, guarantee.ReferenceBlockID, err)
 		}
 		return fmt.Errorf("unexpected error checking collection origin %x at reference block %x: %w", originID, guarantee.ReferenceBlockID, err)

module/validation/receipt_validator.go

@@ -8,6 +8,7 @@ import (
 	"github.com/onflow/flow-go/engine"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/signature"
+	"github.com/onflow/flow-go/state"
 	"github.com/onflow/flow-go/state/fork"
 	"github.com/onflow/flow-go/state/protocol"
 	"github.com/onflow/flow-go/storage"
@@ -108,7 +109,7 @@ func (v *receiptValidator) fetchResult(resultID flow.Identifier) (*flow.Executio
 func (v *receiptValidator) subgraphCheck(result *flow.ExecutionResult, prevResult *flow.ExecutionResult) error {
 	block, err := v.state.AtBlockID(result.BlockID).Head()
 	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
+		if errors.Is(err, state.ErrUnknownSnapshotReference) {
 			return engine.NewInvalidInputErrorf("no block found %v %w", result.BlockID, err)
 		}
 		return err

state/protocol/util.go

@@ -25,7 +25,7 @@ func IsNodeAuthorizedAt(snapshot Snapshot, id flow.Identifier) (bool, error) {
 // IsNodeAuthorizedWithRoleAt returns whether the node with the given ID is a valid
 // un-ejected network participant with the specified role as of the given state snapshot.
 // Expected errors during normal operations:
-//   - storage.ErrNotFound if snapshot references an unknown block
+//   - state.ErrUnknownSnapshotReference if snapshot references an unknown block
 //
 // All other errors are unexpected and potential symptoms of internal state corruption.
 func IsNodeAuthorizedWithRoleAt(snapshot Snapshot, id flow.Identifier, role flow.Role) (bool, error) {
@@ -41,7 +41,7 @@ func IsNodeAuthorizedWithRoleAt(snapshot Snapshot, id flow.Identifier, role flow
 // CheckNodeStatusAt returns whether the node with the given ID is a valid identity at the given
 // state snapshot, and satisfies all checks.
 // Expected errors during normal operations:
-//   - storage.ErrNotFound if snapshot references an unknown block
+//   - state.ErrUnknownSnapshotReference if snapshot references an unknown block
 //
 // All other errors are unexpected and potential symptoms of internal state corruption.
 func CheckNodeStatusAt(snapshot Snapshot, id flow.Identifier, checks ...flow.IdentityFilter) (bool, error) {
@@ -93,7 +93,7 @@ func PreviousEpochExists(snap Snapshot) (bool, error) {
 // FindGuarantors decodes the signer indices from the guarantee, and finds the guarantor identifiers from protocol state
 // Expected Error returns during normal operations:
 //   - signature.InvalidSignerIndicesError if `signerIndices` does not encode a valid set of collection guarantors
-//   - storage.ErrNotFound if the guarantee's ReferenceBlockID is not found
+//   - state.ErrUnknownSnapshotReference if guarantee references an unknown block
 //   - protocol.ErrNextEpochNotCommitted if epoch has not been committed yet
 //   - protocol.ErrClusterNotFound if cluster is not found by the given chainID
 func FindGuarantors(state State, guarantee *flow.CollectionGuarantee) ([]flow.Identifier, error) {