Merge branch 'master' of https://github.com/onflow/cadence into supun…

…/improve-migrations
onflow · Jan 17, 2024 · ea9086c · ea9086c
2 parents 8d09014 + 6a1b9e4
commit ea9086c
Show file tree

Hide file tree

Showing 20 changed files with 873 additions and 237 deletions.
diff --git a/encoding/ccf/simpletype_test.go b/encoding/ccf/simpletype_test.go
@@ -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
 		}

diff --git a/encoding/json/decode.go b/encoding/json/decode.go
@@ -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
 		}
 
@@ -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
 	}
 

diff --git a/encoding/json/encoding_test.go b/encoding/json/encoding_test.go
@@ -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