Merge pull request #3320 from onflow/bastian/sync-atree-register-inli…

…ning-v1.0

migrations/cache.go

@@ -24,18 +24,27 @@ import (
 	"github.com/onflow/cadence/runtime/interpreter"
 )
 
-type StaticTypeCache struct {
+type StaticTypeCache interface {
+	Get(typeID interpreter.TypeID) (interpreter.StaticType, bool)
+	Set(typeID interpreter.TypeID, ty interpreter.StaticType)
+}
+
+type DefaultStaticTypeCache struct {
 	entries sync.Map
 }
 
-func (c *StaticTypeCache) Get(typeID interpreter.TypeID) (interpreter.StaticType, bool) {
+func NewDefaultStaticTypeCache() *DefaultStaticTypeCache {
+	return &DefaultStaticTypeCache{}
+}
+
+func (c *DefaultStaticTypeCache) Get(typeID interpreter.TypeID) (interpreter.StaticType, bool) {
 	v, ok := c.entries.Load(typeID)
 	if !ok {
 		return nil, false
 	}
 	return v.(interpreter.StaticType), true
 }
 
-func (c *StaticTypeCache) Set(typeID interpreter.TypeID, ty interpreter.StaticType) {
+func (c *DefaultStaticTypeCache) Set(typeID interpreter.TypeID, ty interpreter.StaticType) {
 	c.entries.Store(typeID, ty)
 }

migrations/entitlements/migration.go

@@ -29,18 +29,19 @@ import (
 
 type EntitlementsMigration struct {
 	Interpreter       *interpreter.Interpreter
-	migratedTypeCache *migrations.StaticTypeCache
+	migratedTypeCache migrations.StaticTypeCache
 }
 
 var _ migrations.ValueMigration = EntitlementsMigration{}
 
 func NewEntitlementsMigration(inter *interpreter.Interpreter) EntitlementsMigration {
-	return NewEntitlementsMigrationWithCache(inter, &migrations.StaticTypeCache{})
+	staticTypeCache := migrations.NewDefaultStaticTypeCache()
+	return NewEntitlementsMigrationWithCache(inter, staticTypeCache)
 }
 
 func NewEntitlementsMigrationWithCache(
 	inter *interpreter.Interpreter,
-	migratedTypeCache *migrations.StaticTypeCache,
+	migratedTypeCache migrations.StaticTypeCache,
 ) EntitlementsMigration {
 	return EntitlementsMigration{
 		Interpreter:       inter,

migrations/entitlements/migration_test.go

@@ -730,6 +730,7 @@ func convertEntireTestValue(
 			testEntitlementsMigration{inter: inter},
 		},
 		reporter,
+		true,
 	)
 
 	err = migration.Commit()