respond to review

onflow · Aug 16, 2023 · 92b7ffb · 92b7ffb
1 parent 62e3c61
commit 92b7ffb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/runtime/convertValues_test.go b/runtime/convertValues_test.go
@@ -1234,7 +1234,7 @@ func TestImportRuntimeType(t *testing.T) {
 				Authorization: interpreter.NewEntitlementSetAuthorization(
 					nil,
 					func() []common.TypeID { return []common.TypeID{"E", "F"} },
-					1,
+					2,
 					sema.Disjunction),
 				ReferencedType: interpreter.PrimitiveStaticTypeInt,
 			},

diff --git a/runtime/interpreter/interpreter.go b/runtime/interpreter/interpreter.go
@@ -3482,12 +3482,13 @@ func referenceTypeFunction(invocation Invocation) Value {
 
 	var authorization Authorization = UnauthorizedAccess
 	errInIteration := false
+	entitlementsCount := entitlementValues.Count()
 
-	if entitlementValues.Count() > 0 {
+	if entitlementsCount > 0 {
 		authorization = NewEntitlementSetAuthorization(
 			invocation.Interpreter,
 			func() []common.TypeID {
-				var entitlements []common.TypeID = make([]common.TypeID, 0, entitlementValues.Count())
+				entitlements := make([]common.TypeID, 0, entitlementsCount)
 				entitlementValues.Iterate(invocation.Interpreter, func(element Value) (resume bool) {
 					entitlementString, isString := element.(*StringValue)
 					if !isString {
@@ -3506,7 +3507,7 @@ func referenceTypeFunction(invocation Invocation) Value {
 				})
 				return entitlements
 			},
-			entitlementValues.Count(),
+			entitlementsCount,
 			sema.Conjunction,
 		)
 	}

diff --git a/runtime/interpreter/statictype.go b/runtime/interpreter/statictype.go
@@ -523,6 +523,10 @@ func NewEntitlementSetAuthorization(
 	})
 
 	entitlementList := entitlementListConstructor()
+	if len(entitlementList) > entitlementListSize {
+		// it should not be possible to reach this point unless something is implemented wrong
+		panic(errors.NewUnreachableError())
+	}
 
 	entitlements := orderedmap.New[sema.TypeIDOrderedSet](len(entitlementList))
 	for _, entitlement := range entitlementList {

diff --git a/runtime/tests/interpreter/entitlements_test.go b/runtime/tests/interpreter/entitlements_test.go
@@ -610,7 +610,7 @@ func TestInterpretEntitledReferenceCasting(t *testing.T) {
 				interpreter.NewEntitlementSetAuthorization(
 					nil,
 					func() []common.TypeID { return []common.TypeID{"S.test.X", "S.test.Y"} },
-					1,
+					2,
 					sema.Conjunction,
 				),
 				interpreter.PrimitiveStaticTypeInt,