use ArrayValue/DictionaryValue SetType in migrations

onflow · Mar 8, 2024 · 0d6f45a · 0d6f45a
1 parent abd6859
commit 0d6f45a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/migrations/entitlements/migration.go b/migrations/entitlements/migration.go
@@ -241,11 +241,9 @@ func ConvertValueToEntitlements(
 			return nil, nil
 		}
 
-		return v.NewWithType(
-			inter,
-			interpreter.EmptyLocationRange,
+		v.SetType(
 			entitledElementType.(interpreter.ArrayStaticType),
-		), nil
+		)
 
 	case *interpreter.DictionaryValue:
 		elementType := v.Type
@@ -259,11 +257,9 @@ func ConvertValueToEntitlements(
 			return nil, nil
 		}
 
-		return v.NewWithType(
-			inter,
-			interpreter.EmptyLocationRange,
+		v.SetType(
 			entitledElementType.(*interpreter.DictionaryStaticType),
-		), nil
+		)
 
 	case *interpreter.IDCapabilityValue:
 		borrowType := v.BorrowType

diff --git a/migrations/migration_test.go b/migrations/migration_test.go
@@ -1151,15 +1151,15 @@ func (testContainerMigration) Migrate(
 			interpreter.PrimitiveStaticTypeAnyStruct,
 		)
 
-		return value.NewWithType(inter, emptyLocationRange, newType), nil
+		value.SetType(newType)
 
 	case *interpreter.ArrayValue:
 
 		newType := interpreter.NewVariableSizedStaticType(nil,
 			interpreter.PrimitiveStaticTypeAnyStruct,
 		)
 
-		return value.NewWithType(inter, emptyLocationRange, newType), nil
+		value.SetType(newType)
 
 	case *interpreter.CompositeValue:
 		if value.QualifiedIdentifier == "Inner" {

diff --git a/migrations/statictypes/statictype_migration.go b/migrations/statictypes/statictype_migration.go
@@ -136,23 +136,19 @@ func (m *StaticTypeMigration) Migrate(
 			return
 		}
 
-		return value.NewWithType(
-			inter,
-			interpreter.EmptyLocationRange,
+		value.SetType(
 			convertedElementType.(interpreter.ArrayStaticType),
-		), nil
+		)
 
 	case *interpreter.DictionaryValue:
 		convertedElementType := m.maybeConvertStaticType(value.Type, nil)
 		if convertedElementType == nil {
 			return
 		}
 
-		return value.NewWithType(
-			inter,
-			interpreter.EmptyLocationRange,
+		value.SetType(
 			convertedElementType.(*interpreter.DictionaryStaticType),
-		), nil
+		)
 	}
 
 	return