Merge pull request #3118 from onflow/bastian/3112-intersection-type-m…

…igration
onflow · Feb 22, 2024 · 8302607 · 8302607
2 parents a6388c5 + 8b2476c
commit 8302607
Show file tree

Hide file tree

Showing 9 changed files with 2,023 additions and 1,444 deletions.
diff --git a/migrations/entitlements/migration.go b/migrations/entitlements/migration.go
diff --git a/migrations/entitlements/migration_test.go b/migrations/entitlements/migration_test.go
diff --git a/migrations/migration.go b/migrations/migration.go
@@ -252,18 +252,23 @@ func (m *StorageMigration) MigrateNestedValue(
 		// Read the keys first, so the iteration wouldn't be affected
 		// by the modification of the nested values.
 		var existingKeysAndValues []keyValuePair
-		dictionary.Iterate(m.interpreter, func(key, value interpreter.Value) (resume bool) {
+
+		iterator := dictionary.Iterator()
+
+		for {
+			key, value := iterator.Next(nil)
+			if key == nil {
+				break
+			}
+
 			existingKeysAndValues = append(
 				existingKeysAndValues,
 				keyValuePair{
 					key:   key,
 					value: value,
 				},
 			)
-
-			// continue iteration
-			return true
-		})
+		}
 
 		for _, existingKeyAndValue := range existingKeysAndValues {
 			existingKey := existingKeyAndValue.key

diff --git a/migrations/migration_test.go b/migrations/migration_test.go
@@ -33,7 +33,6 @@ import (
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/interpreter"
 	"github.com/onflow/cadence/runtime/stdlib"
-	"github.com/onflow/cadence/runtime/tests/checker"
 	. "github.com/onflow/cadence/runtime/tests/runtime_utils"
 	"github.com/onflow/cadence/runtime/tests/utils"
 )
@@ -948,148 +947,3 @@ func TestContractMigration(t *testing.T) {
 		value,
 	)
 }
-
-func TestMigrationPanics(t *testing.T) {
-
-	t.Parallel()
-
-	t.Run("composite dictionary", func(t *testing.T) {
-		t.Parallel()
-
-		ledger := NewTestLedger(nil, nil)
-		account := common.Address{0x42}
-
-		t.Run("prepare", func(t *testing.T) {
-
-			fooContractLocation := common.NewAddressLocation(nil, account, "Foo")
-
-			storage := runtime.NewStorage(ledger, nil)
-			locationRange := interpreter.EmptyLocationRange
-
-			contractChecker, err := checker.ParseAndCheckWithOptions(t, `
-                access(all) contract Foo {
-                    access(all) struct Bar {}
-                }`,
-				checker.ParseAndCheckOptions{
-					Location: fooContractLocation,
-				},
-			)
-			require.NoError(t, err)
-
-			inter, err := interpreter.NewInterpreter(
-				nil,
-				utils.TestLocation,
-				&interpreter.Config{
-					Storage:                       storage,
-					AtreeValueValidationEnabled:   false,
-					AtreeStorageValidationEnabled: false,
-					ImportLocationHandler: func(inter *interpreter.Interpreter, location common.Location) interpreter.Import {
-						program := interpreter.ProgramFromChecker(contractChecker)
-						subInterpreter, err := inter.NewSubInterpreter(program, location)
-						if err != nil {
-							panic(err)
-						}
-
-						return interpreter.InterpreterImport{
-							Interpreter: subInterpreter,
-						}
-					},
-				},
-			)
-			require.NoError(t, err)
-
-			const fooBarQualifiedIdentifier = "Foo.Bar"
-
-			dictionaryAnyStructStaticType :=
-				interpreter.NewDictionaryStaticType(
-					nil,
-					interpreter.PrimitiveStaticTypeString,
-					interpreter.NewCompositeStaticTypeComputeTypeID(
-						nil,
-						fooContractLocation,
-						fooBarQualifiedIdentifier,
-					),
-				)
-
-			storedValue := interpreter.NewDictionaryValue(
-				inter,
-				emptyLocationRange,
-				dictionaryAnyStructStaticType,
-			)
-
-			transferredValue := storedValue.Transfer(
-				inter,
-				locationRange,
-				atree.Address(account),
-				false,
-				nil,
-				nil,
-			)
-
-			inter.WriteStored(
-				account,
-				common.PathDomainStorage.Identifier(),
-				interpreter.StringStorageMapKey("dictionary_value"),
-				transferredValue,
-			)
-
-			err = storage.Commit(inter, true)
-			require.NoError(t, err)
-		})
-
-		t.Run("migrate", func(t *testing.T) {
-			storage := runtime.NewStorage(ledger, nil)
-
-			inter, err := interpreter.NewInterpreter(
-				nil,
-				utils.TestLocation,
-				&interpreter.Config{
-					Storage:                       storage,
-					AtreeValueValidationEnabled:   false,
-					AtreeStorageValidationEnabled: false,
-					ImportLocationHandler: func(_ *interpreter.Interpreter, _ common.Location) interpreter.Import {
-						// During the migration, treat the imported `Foo` contract as un-migrated.
-						panic(errors.New("type checking error in Foo"))
-					},
-				},
-			)
-			require.NoError(t, err)
-
-			migration := NewStorageMigration(inter, storage)
-
-			reporter := newTestReporter()
-
-			migration.Migrate(
-				&AddressSliceIterator{
-					Addresses: []common.Address{
-						account,
-					},
-				},
-				migration.NewValueMigrationsPathMigrator(
-					reporter,
-					testStringMigration{},
-					testInt8Migration{},
-					testCapMigration{},
-				),
-			)
-
-			err = migration.Commit()
-			require.NoError(t, err)
-
-			expectedErrors := map[struct {
-				interpreter.StorageKey
-				interpreter.StorageMapKey
-			}][]string{
-				{
-					StorageKey: interpreter.StorageKey{
-						Key:     common.PathDomainStorage.Identifier(),
-						Address: account,
-					},
-					StorageMapKey: interpreter.StringStorageMapKey("dictionary_value"),
-				}: {"StorageMigration"},
-			}
-
-			assert.Equal(t, expectedErrors, reporter.errored)
-		})
-	})
-}