Merge pull request #2405 from onflow/sainati/entitled-references

onflow · Jun 1, 2023 · 5739c86 · 5739c86
2 parents 7856e8a + f9b39e2
commit 5739c86
Show file tree

Hide file tree

Showing 79 changed files with 6,848 additions and 2,256 deletions.
diff --git a/docs/subtyping.md b/docs/subtyping.md
diff --git a/encoding/ccf/ccf_test.go b/encoding/ccf/ccf_test.go
@@ -6881,7 +6881,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 			cadence.String("a"),
 			cadence.String("b"),
 		}).WithType(cadence.NewVariableSizedArrayType(
-			cadence.NewReferenceType(false, cadence.NewStringType()),
+			cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.NewStringType()),
 		)),
 		expected: []byte{
 			// language=json, format=json-cdc
@@ -6929,7 +6929,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 			cadence.NewOptional(cadence.String("a")),
 			cadence.NewOptional(nil),
 		}).WithType(cadence.NewVariableSizedArrayType(
-			cadence.NewReferenceType(false, cadence.NewOptionalType(cadence.NewStringType())),
+			cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.NewOptionalType(cadence.NewStringType())),
 		)),
 		expected: []byte{
 			// language=json, format=json-cdc
@@ -6978,8 +6978,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 				KeyType: cadence.TheStringType,
 				ElementType: &cadence.OptionalType{
 					Type: &cadence.ReferenceType{
-						Type:       cadence.TheInt128Type,
-						Authorized: false,
+						Type: cadence.TheInt128Type,
 					},
 				},
 			}
@@ -7055,7 +7054,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 			cadence.String("a"),
 			cadence.NewUInt8(1),
 		}).WithType(cadence.NewVariableSizedArrayType(
-			cadence.NewReferenceType(false, cadence.NewAnyStructType()),
+			cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.NewAnyStructType()),
 		)),
 		expected: []byte{
 			// language=json, format=json-cdc
@@ -7123,7 +7122,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 					cadence.String("b"),
 				}).WithType(simpleStructType),
 			}).WithType(cadence.NewVariableSizedArrayType(
-				cadence.NewReferenceType(false, simpleStructType),
+				cadence.NewReferenceType(cadence.UnauthorizedAccess, simpleStructType),
 			))
 		}(),
 		expected: []byte{
@@ -7216,7 +7215,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 					cadence.String("b"),
 				}).WithType(simpleStructType),
 			}).WithType(cadence.NewVariableSizedArrayType(
-				cadence.NewReferenceType(false, cadence.NewAnyStructType()),
+				cadence.NewReferenceType(cadence.UnauthorizedAccess, cadence.NewAnyStructType()),
 			))
 		}(),
 		expected: []byte{
@@ -7321,7 +7320,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 			cadence.NewOptional(nil),
 		}).WithType(cadence.NewVariableSizedArrayType(
 			cadence.NewReferenceType(
-				false,
+				cadence.UnauthorizedAccess,
 				cadence.NewOptionalType(cadence.NewAnyStructType()),
 			))),
 		expected: []byte{
@@ -7393,7 +7392,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 		}).WithType(cadence.NewVariableSizedArrayType(
 			cadence.NewOptionalType(
 				cadence.NewReferenceType(
-					false,
+					cadence.UnauthorizedAccess,
 					cadence.NewAnyStructType(),
 				)))),
 		expected: []byte{
@@ -7465,7 +7464,7 @@ func TestEncodeValueOfReferenceType(t *testing.T) {
 		}).WithType(cadence.NewVariableSizedArrayType(
 			cadence.NewOptionalType(
 				cadence.NewReferenceType(
-					false,
+					cadence.UnauthorizedAccess,
 					cadence.NewOptionalType(
 						cadence.NewAnyStructType(),
 					))))),
@@ -8828,8 +8827,8 @@ func TestEncodeType(t *testing.T) {
 			t,
 			cadence.TypeValue{
 				StaticType: &cadence.ReferenceType{
-					Authorized: false,
-					Type:       cadence.IntType{},
+					Authorization: cadence.UnauthorizedAccess,
+					Type:          cadence.IntType{},
 				},
 			},
 			[]byte{

diff --git a/encoding/ccf/decode_type.go b/encoding/ccf/decode_type.go
@@ -494,7 +494,8 @@ func (d *Decoder) decodeReferenceType(
 	}
 
 	// element 0: authorized
-	authorized, err := d.dec.DecodeBool()
+	// TODO: implement in later PR
+	// authorized, err := d.dec.DecodeBool()
 	if err != nil {
 		return nil, err
 	}
@@ -508,8 +509,9 @@ func (d *Decoder) decodeReferenceType(
 	if elementType == nil {
 		return nil, errors.New("unexpected nil type as reference type")
 	}
-
-	return cadence.NewMeteredReferenceType(d.gauge, authorized, elementType), nil
+	// TODO: implement in later PR
+	// return cadence.NewMeteredReferenceType(d.gauge, authorized, elementType), nil
+	return nil, nil
 }
 
 // decodeRestrictedType decodes restricted-type or restricted-type-value as

diff --git a/encoding/ccf/encode_type.go b/encoding/ccf/encode_type.go
@@ -339,7 +339,8 @@ func (e *Encoder) encodeReferenceTypeWithRawTag(
 	}
 
 	// element 0: authorized as bool
-	err = e.enc.EncodeBool(typ.Authorized)
+	// TODO: implement in later PR
+	// err = e.enc.EncodeBool(typ.Authorized)
 	if err != nil {
 		return err
 	}