add legacyAuthorized field to reference types

onflow · Jan 23, 2024 · 110bd77 · 110bd77
1 parent 45a736a
commit 110bd77
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 19 deletions.
diff --git a/runtime/ast/access.go b/runtime/ast/access.go
@@ -215,7 +215,7 @@ const (
 	AccessContract
 	AccessAccount
 	AccessAll
-	PubSettableLegacy // Deprecated
+	AccessPubSettableLegacy // Deprecated
 )
 
 func PrimitiveAccessCount() int {
@@ -254,7 +254,7 @@ func (a PrimitiveAccess) Keyword() string {
 		return "access(account)"
 	case AccessContract:
 		return "access(contract)"
-	case PubSettableLegacy:
+	case AccessPubSettableLegacy:
 		return "pub(set)"
 	}
 
@@ -273,7 +273,7 @@ func (a PrimitiveAccess) Description() string {
 		return "account"
 	case AccessContract:
 		return "contract"
-	case PubSettableLegacy:
+	case AccessPubSettableLegacy:
 		return "legacy public settable"
 	}
 

diff --git a/runtime/ast/primitiveaccess_string.go b/runtime/ast/primitiveaccess_string.go
diff --git a/runtime/ast/type.go b/runtime/ast/type.go
@@ -537,9 +537,10 @@ func (t *FunctionType) CheckEqual(other Type, checker TypeEqualityChecker) error
 
 // ReferenceType
 type ReferenceType struct {
-	Type          Type          `json:"ReferencedType"`
-	StartPos      Position      `json:"-"`
-	Authorization Authorization `json:"Authorization"`
+	Type             Type     `json:"ReferencedType"`
+	StartPos         Position `json:"-"`
+	LegacyAuthorized bool
+	Authorization    Authorization `json:"Authorization"`
 }
 
 var _ Type = &ReferenceType{}

diff --git a/runtime/ast/type_test.go b/runtime/ast/type_test.go
@@ -1205,6 +1205,7 @@ func TestReferenceType_MarshalJSON(t *testing.T) {
 		`
         {
             "Type": "ReferenceType",
+			"LegacyAuthorized": false,
             "Authorization": {
 				 "ConjunctiveElements": [
 					{ 

diff --git a/runtime/old_parser/declaration.go b/runtime/old_parser/declaration.go
@@ -273,7 +273,7 @@ func parseAccess(p *parser) (ast.PrimitiveAccess, error) {
 			return ast.AccessNotSpecified, err
 		}
 
-		return ast.PubSettableLegacy, nil
+		return ast.AccessPubSettableLegacy, nil
 
 	case keywordAccess:
 		// Skip the `access` keyword

diff --git a/runtime/old_parser/declaration_test.go b/runtime/old_parser/declaration_test.go
@@ -1531,7 +1531,7 @@ func TestParseAccess(t *testing.T) {
 		require.Empty(t, errs)
 
 		utils.AssertEqualWithDiff(t,
-			ast.PubSettableLegacy,
+			ast.AccessPubSettableLegacy,
 			result,
 		)
 	})
@@ -2648,7 +2648,7 @@ func TestParseCompositeDeclaration(t *testing.T) {
 					Members: ast.NewUnmeteredMembers(
 						[]ast.Declaration{
 							&ast.FieldDeclaration{
-								Access:       ast.PubSettableLegacy,
+								Access:       ast.AccessPubSettableLegacy,
 								VariableKind: ast.VariableKindVariable,
 								Identifier: ast.Identifier{
 									Identifier: "foo",
@@ -3031,7 +3031,7 @@ func TestParseAttachmentDeclaration(t *testing.T) {
 					Members: ast.NewUnmeteredMembers(
 						[]ast.Declaration{
 							&ast.FieldDeclaration{
-								Access:       ast.PubSettableLegacy,
+								Access:       ast.AccessPubSettableLegacy,
 								VariableKind: ast.VariableKindVariable,
 								Identifier: ast.Identifier{
 									Identifier: "foo",
@@ -3233,7 +3233,7 @@ func TestParseInterfaceDeclaration(t *testing.T) {
 					Members: ast.NewUnmeteredMembers(
 						[]ast.Declaration{
 							&ast.FieldDeclaration{
-								Access:       ast.PubSettableLegacy,
+								Access:       ast.AccessPubSettableLegacy,
 								VariableKind: ast.VariableKindVariable,
 								Identifier: ast.Identifier{
 									Identifier: "foo",
@@ -4423,7 +4423,7 @@ func TestParseStructure(t *testing.T) {
 				Members: ast.NewUnmeteredMembers(
 					[]ast.Declaration{
 						&ast.FieldDeclaration{
-							Access:       ast.PubSettableLegacy,
+							Access:       ast.AccessPubSettableLegacy,
 							VariableKind: ast.VariableKindVariable,
 							Identifier: ast.Identifier{
 								Identifier: "foo",

diff --git a/runtime/old_parser/type.go b/runtime/old_parser/type.go
@@ -169,12 +169,15 @@ func init() {
 					return nil, err
 				}
 
-				return ast.NewReferenceType(
+				refType := ast.NewReferenceType(
 					p.memoryGauge,
 					nil,
 					right,
 					token.StartPos,
-				), nil
+				)
+				refType.LegacyAuthorized = true
+
+				return refType, nil
 
 			default:
 				return parseNominalTypeRemainder(p, token)

diff --git a/runtime/old_parser/type_test.go b/runtime/old_parser/type_test.go
@@ -307,7 +307,8 @@ func TestParseReferenceType(t *testing.T) {
 
 		utils.AssertEqualWithDiff(t,
 			&ast.ReferenceType{
-				Authorization: nil,
+				Authorization:    nil,
+				LegacyAuthorized: true,
 				Type: &ast.NominalType{
 					Identifier: ast.Identifier{
 						Identifier: "Int",
@@ -2739,7 +2740,8 @@ func TestParseAuthorizedReferenceType(t *testing.T) {
 				TypeAnnotation: &ast.TypeAnnotation{
 					IsResource: false,
 					Type: &ast.ReferenceType{
-						Authorization: nil,
+						LegacyAuthorized: true,
+						Authorization:    nil,
 						Type: &ast.NominalType{
 							Identifier: ast.Identifier{
 								Identifier: "R", Pos: ast.Position{Offset: 21, Line: 2, Column: 20}},