Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the entitlements migration #3026

Merged
merged 9 commits into from
Jan 17, 2024
Merged

Fix the entitlements migration #3026

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ed57ba8
panic when converting deprecated primitive static type to sema type
turbolent Jan 16, 2024
b66698d
improve tests
turbolent Jan 17, 2024
67860c8
bring back AuthAccount/PublicAccount static to sema type conversion
turbolent Jan 17, 2024
29a3e2e
add StaticType.IsDeprecated
turbolent Jan 17, 2024
f077a2e
ignore deprecated types in entitlements migration
turbolent Jan 17, 2024
d73e3bd
add test for InclusiveRange.IsDeprecated
turbolent Jan 17, 2024
bd85a31
prevent deprecated static types from getting migrated
turbolent Jan 17, 2024
1031ec2
improve naming and error message
turbolent Jan 17, 2024
d5c319c
do not add authorization to sema types which were migrated from depre…
turbolent Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions encoding/ccf/simpletype_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,12 @@ func TestTypeConversion(t *testing.T) {
}

for ty := interpreter.PrimitiveStaticType(1); ty < interpreter.PrimitiveStaticType_Count; ty++ {
if !ty.IsDefined() {
if !ty.IsDefined() || ty.IsDeprecated() { //nolint:staticcheck
continue
}

semaType := ty.SemaType()

// Some primitive static types are deprecated,
// and only exist for migration purposes,
// so do not have an equivalent sema type
if semaType == nil {
continue
}

if ty.IsDeprecated() { //nolint:staticcheck
continue
}

if _, ok := semaType.(*sema.CapabilityType); ok {
continue
}
Expand Down
9 changes: 1 addition & 8 deletions encoding/json/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ var simpleTypes = func() map[string]cadence.Type {
typeMap["Bytes"] = cadence.TheBytesType

for ty := interpreter.PrimitiveStaticType(1); ty < interpreter.PrimitiveStaticType_Count; ty++ {
if !ty.IsDefined() {
if !ty.IsDefined() || ty.IsDeprecated() { //nolint:staticcheck
continue
}

Expand All @@ -1215,13 +1215,6 @@ var simpleTypes = func() map[string]cadence.Type {

semaType := ty.SemaType()

// Some primitive static types are deprecated,
// and only exist for migration purposes,
// so do not have an equivalent sema type
if semaType == nil {
continue
}

typeMap[string(semaType.ID())] = cadenceType
}

Expand Down
9 changes: 1 addition & 8 deletions encoding/json/encoding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3667,19 +3667,12 @@ func TestSimpleTypes(t *testing.T) {
}

for ty := interpreter.PrimitiveStaticType(1); ty < interpreter.PrimitiveStaticType_Count; ty++ {
if !ty.IsDefined() {
if !ty.IsDefined() || ty.IsDeprecated() { //nolint:staticcheck
continue
}

semaType := ty.SemaType()

// Some primitive static types are deprecated,
// and only exist for migration purposes,
// so do not have an equivalent sema type
if semaType == nil {
continue
}

cadenceType := cadence.PrimitiveType(ty)
if !canEncodeAsSimpleType(cadenceType) {
continue
Expand Down
Loading
Loading