rename error

onflow · Nov 5, 2021 · d14cb20 · d14cb20
1 parent a86f1ab
commit d14cb20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/runtime/interpreter/errors.go b/runtime/interpreter/errors.go
@@ -524,11 +524,11 @@ func (e NonStorableStaticTypeError) Error() string {
 
 // InterfaceMissingLocation is reported during interface lookup,
 // if an interface is looked up without a location
-type InterfaceMissingLocation struct {
+type InterfaceMissingLocationError struct {
 	QualifiedIdentifier string
 }
 
-func (e *InterfaceMissingLocation) Error() string {
+func (e *InterfaceMissingLocationError) Error() string {
 	return fmt.Sprintf(
 		"tried to look up interface %s without a location",
 		e.QualifiedIdentifier,

diff --git a/runtime/interpreter/interpreter.go b/runtime/interpreter/interpreter.go
@@ -2621,9 +2621,6 @@ func lookupInterface(interpreter *Interpreter, typeID string) (*sema.InterfaceTy
 	if err != nil {
 		return nil, err
 	}
-	if location == nil {
-		return nil, &InterfaceMissingLocation{QualifiedIdentifier: qualifiedIdentifier}
-	}
 
 	typ, err := interpreter.getInterfaceType(location, qualifiedIdentifier)
 	if err != nil {
@@ -3846,6 +3843,10 @@ func (interpreter *Interpreter) getNativeCompositeType(qualifiedIdentifier strin
 }
 
 func (interpreter *Interpreter) getInterfaceType(location common.Location, qualifiedIdentifier string) (*sema.InterfaceType, error) {
+	if location == nil {
+		return nil, &InterfaceMissingLocationError{QualifiedIdentifier: qualifiedIdentifier}
+	}
+
 	typeID := location.TypeID(qualifiedIdentifier)
 
 	elaboration := interpreter.getElaboration(location)