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

Migrate static types of arrays and dictionaries #3141

Merged
merged 2 commits into from
Feb 28, 2024
Merged

Migrate static types of arrays and dictionaries #3141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5609be
Migrate static types of arrays and dictionaries
SupunS Feb 28, 2024
621b611
Add entries to the dictionary test
SupunS Feb 28, 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
80 changes: 80 additions & 0 deletions migrations/statictypes/account_type_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,46 @@ func TestMigratingValuesWithAccountStaticType(t *testing.T) {
require.NoError(t, err)

testCases := map[string]testCase{
"dictionary_value": {
storedValue: interpreter.NewDictionaryValue(
inter,
locationRange,
interpreter.NewDictionaryStaticType(
nil,
interpreter.PrimitiveStaticTypeString,
interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
),
),
expectedValue: interpreter.NewDictionaryValue(
inter,
locationRange,
interpreter.NewDictionaryStaticType(
nil,
interpreter.PrimitiveStaticTypeString,
unauthorizedAccountReferenceType,
),
),
},
"array_value": {
storedValue: interpreter.NewArrayValue(
inter,
locationRange,
interpreter.NewVariableSizedStaticType(
nil,
interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
),
common.Address{},
),
expectedValue: interpreter.NewArrayValue(
inter,
locationRange,
interpreter.NewVariableSizedStaticType(
nil,
unauthorizedAccountReferenceType,
),
common.Address{},
),
},
"account_capability_value": {
storedValue: interpreter.NewUnmeteredCapabilityValue(
123,
Expand Down Expand Up @@ -955,6 +995,46 @@ func TestMigratingValuesWithAccountStaticType(t *testing.T) {
BorrowType: unauthorizedAccountReferenceType,
},
},
"capability_dictionary": {
storedValue: interpreter.NewDictionaryValue(
inter,
locationRange,
interpreter.NewDictionaryStaticType(
nil,
interpreter.PrimitiveStaticTypeString,
interpreter.NewCapabilityStaticType(
nil,
interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
),
),
interpreter.NewUnmeteredStringValue("key"),
interpreter.NewCapabilityValue(
nil,
interpreter.NewUnmeteredUInt64Value(1234),
interpreter.NewAddressValue(nil, common.Address{}),
interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
),
),
expectedValue: interpreter.NewDictionaryValue(
inter,
locationRange,
interpreter.NewDictionaryStaticType(
nil,
interpreter.PrimitiveStaticTypeString,
interpreter.NewCapabilityStaticType(
nil,
unauthorizedAccountReferenceType,
),
),
interpreter.NewUnmeteredStringValue("key"),
interpreter.NewCapabilityValue(
nil,
interpreter.NewUnmeteredUInt64Value(1234),
interpreter.NewAddressValue(nil, common.Address{}),
unauthorizedAccountReferenceType,
),
),
},
}

// Store values
Expand Down
47 changes: 46 additions & 1 deletion migrations/statictypes/statictype_migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (m *StaticTypeMigration) Migrate(
_ interpreter.StorageKey,
_ interpreter.StorageMapKey,
value interpreter.Value,
_ *interpreter.Interpreter,
inter *interpreter.Interpreter,
) (newValue interpreter.Value, err error) {
switch value := value.(type) {
case interpreter.TypeValue:
Expand Down Expand Up @@ -129,6 +129,51 @@ func (m *StaticTypeMigration) Migrate(
value.CapabilityID,
value.TargetPath,
), nil

case *interpreter.ArrayValue:
convertedElementType := m.maybeConvertStaticType(value.Type, nil)
if convertedElementType == nil {
return
}

iterator := value.Iterator(inter, interpreter.EmptyLocationRange)

return interpreter.NewArrayValueWithIterator(
inter,
convertedElementType.(interpreter.ArrayStaticType),
value.GetOwner(),
uint64(value.Count()),
func() interpreter.Value {
return iterator.Next(inter, interpreter.EmptyLocationRange)
},
), nil

case *interpreter.DictionaryValue:
convertedElementType := m.maybeConvertStaticType(value.Type, nil)
if convertedElementType == nil {
return
}

var keysAndValues []interpreter.Value

iterator := value.Iterator()
for {
keyValue, value := iterator.Next(inter)
if keyValue == nil {
break
}

keysAndValues = append(keysAndValues, keyValue)
keysAndValues = append(keysAndValues, value)
SupunS marked this conversation as resolved.
Show resolved Hide resolved
}

return interpreter.NewDictionaryValueWithAddress(
inter,
interpreter.EmptyLocationRange,
convertedElementType.(*interpreter.DictionaryStaticType),
value.GetOwner(),
keysAndValues...,
), nil
}

return
Expand Down
Loading