Merge master into v1.0 atree register inlining feature branch #3229
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ence-invalidation
Convert references based on borrow type
Resource Reference Invalidation Improvements
Port fixes of v0.42.8-patch.4
…zation Fix built-in type import
…ype-dereference
remove ability to dereference arrays or dicts of structs
…te field the function is currently only used in tests, but might be used in the future
…ield-check-resource-loss
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:feature/atree-register-inlining-v1.0 commit d258aa6 Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
21 tasks
6 tasks
dsainati1
approved these changes
Apr 9, 2024
SupunS
approved these changes
Apr 9, 2024
43ad9af
into
feature/atree-register-inlining-v1.0
7 of 9 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Conflict resolution:
commit 03e9e10da0c6ce4e114f89f086823ee60406f475 Merge: d258aa622 50d446334 Author: Bastian Müller <bastian@turbolent.com> Date: Mon Apr 8 15:25:51 2024 -0700 Merge branch 'master' into bastian/update-atree-register-inlining-v1.0 diff --git a/migrations/legacy_intersection_type.go b/migrations/legacy_intersection_type.go index 4a9fcc96d..f89e5075f 100644 --- a/migrations/legacy_intersection_type.go +++ b/migrations/legacy_intersection_type.go @@ -33,39 +33,6 @@ type LegacyIntersectionType struct { var _ interpreter.StaticType = &LegacyIntersectionType{} -func (t *LegacyIntersectionType) Equal(other interpreter.StaticType) bool { - var otherTypes []*interpreter.InterfaceStaticType - - switch other := other.(type) { - - case *LegacyIntersectionType: - otherTypes = other.Types - - case *interpreter.IntersectionStaticType: - otherTypes = other.Types - - default: - return false - } - - if len(t.Types) != len(otherTypes) { - return false - } - -outer: - for _, typ := range t.Types { - for _, otherType := range otherTypes { - if typ.Equal(otherType) { - continue outer - } - } - - return false - } - - return true -} - func (t *LegacyIntersectionType) ID() common.TypeID { interfaceTypeIDs := make([]string, 0, len(t.Types)) for _, interfaceType := range t.Types { diff --git a/migrations/legacy_primitivestatic_type.go b/migrations/legacy_primitivestatic_type.go index 173fbb455..5cd62a674 100644 --- a/migrations/legacy_primitivestatic_type.go +++ b/migrations/legacy_primitivestatic_type.go @@ -32,20 +32,6 @@ type LegacyPrimitiveStaticType struct { var _ interpreter.StaticType = LegacyPrimitiveStaticType{} -func (t LegacyPrimitiveStaticType) Equal(other interpreter.StaticType) bool { - switch other := other.(type) { - - case LegacyPrimitiveStaticType: - return t == other - - case interpreter.PrimitiveStaticType: - return t.PrimitiveStaticType == other - - default: - return false - } -} - func (t LegacyPrimitiveStaticType) ID() common.TypeID { primitiveStaticType := t.PrimitiveStaticType diff --git a/migrations/legacy_reference_type.go b/migrations/legacy_reference_type.go index d73a147df..7d873a4db 100644 --- a/migrations/legacy_reference_type.go +++ b/migrations/legacy_reference_type.go @@ -34,26 +34,6 @@ type LegacyReferenceType struct { var _ interpreter.StaticType = &LegacyReferenceType{} -// Equal() compares both value and type of t and other. -// LegacyReferenceType.Equal() is needed because Equal() in general -// compares values and their types. Embedded ReferenceStaticType.Equal() -// returns false when other is *LegacyReferenceType type. -func (t *LegacyReferenceType) Equal(other interpreter.StaticType) bool { - switch other := other.(type) { - - case *LegacyReferenceType: - return t.Authorization.Equal(other.Authorization) && - t.ReferencedType.Equal(other.ReferencedType) - - case *interpreter.ReferenceStaticType: - return t.Authorization.Equal(other.Authorization) && - t.ReferencedType.Equal(other.ReferencedType) - - default: - return false - } -} - func (t *LegacyReferenceType) ID() common.TypeID { if !t.HasLegacyIsAuthorized { // Encode as a regular reference type diff --git a/migrations/statictypes/account_type_migration_test.go b/migrations/statictypes/account_type_migration_test.go remerge CONFLICT (content): Merge conflict in migrations/statictypes/account_type_migration_test.go index 30d53c092..78aa468ec 100644 --- a/migrations/statictypes/account_type_migration_test.go +++ b/migrations/statictypes/account_type_migration_test.go @@ -1227,209 +1227,6 @@ func TestAccountTypeRehash(t *testing.T) { return interpreter.NewUnmeteredStringValue(s) } -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - storage, inter := newStorageAndInterpreter(t) - - dictionaryStaticType := interpreter.NewDictionaryStaticType( - nil, - interpreter.PrimitiveStaticTypeMetaType, - interpreter.PrimitiveStaticTypeString, - ) - dictValue := interpreter.NewDictionaryValue(inter, locationRange, dictionaryStaticType) - - accountTypes := []interpreter.PrimitiveStaticType{ - interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAuthAccount, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAuthAccountCapabilities, //nolint:staticcheck - interpreter.PrimitiveStaticTypePublicAccountCapabilities, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAuthAccountAccountCapabilities, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAuthAccountStorageCapabilities, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAuthAccountContracts, //nolint:staticcheck - interpreter.PrimitiveStaticTypePublicAccountContracts, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAuthAccountKeys, //nolint:staticcheck - interpreter.PrimitiveStaticTypePublicAccountKeys, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAuthAccountInbox, //nolint:staticcheck - interpreter.PrimitiveStaticTypeAccountKey, //nolint:staticcheck - } - - for _, typ := range accountTypes { - typeValue := interpreter.NewUnmeteredTypeValue( - migrations.LegacyPrimitiveStaticType{ - PrimitiveStaticType: typ, - }, - ) - dictValue.Insert( - inter, - locationRange, - typeValue, - newStringValue(typ.String()), - ) - } - - storageMap := storage.GetStorageMap( - testAddress, - common.PathDomainStorage.Identifier(), - true, - ) - - storageMap.SetValue(inter, - storageMapKey, - dictValue.Transfer( - inter, - locationRange, - atree.Address(testAddress), - false, - nil, - nil, - true, // dictValue is standalone - ), - ) - - err := storage.Commit(inter, false) - require.NoError(t, err) - }) - - t.Run("migrate", func(t *testing.T) { - - storage, inter := newStorageAndInterpreter(t) - - migration := migrations.NewStorageMigration(inter, storage) - - reporter := newTestReporter() - - migration.MigrateAccount( - testAddress, - migration.NewValueMigrationsPathMigrator( - reporter, - NewStaticTypeMigration(), - ), - ) - - err := migration.Commit() - require.NoError(t, err) - - // Assert - - require.Empty(t, reporter.errors) - - err = storage.CheckHealth() - require.NoError(t, err) - - require.Equal(t, - map[struct { - interpreter.StorageKey - interpreter.StorageMapKey - }]struct{}{ - { - StorageKey: interpreter.StorageKey{ - Address: testAddress, - Key: common.PathDomainStorage.Identifier(), - }, - StorageMapKey: storageMapKey, - }: {}, - }, - reporter.migrated, - ) - }) - - t.Run("load", func(t *testing.T) { - - storage, inter := newStorageAndInterpreter(t) - - storageMap := storage.GetStorageMap(testAddress, common.PathDomainStorage.Identifier(), false) - storedValue := storageMap.ReadValue(inter, storageMapKey) - - require.IsType(t, &interpreter.DictionaryValue{}, storedValue) - - dictValue := storedValue.(*interpreter.DictionaryValue) - - var existingKeys []interpreter.Value - dictValue.Iterate( - inter, - interpreter.EmptyLocationRange, - func(key, value interpreter.Value) (resume bool) { - existingKeys = append(existingKeys, key) - // continue iteration - return true - }, - ) - - for _, key := range existingKeys { - actual := dictValue.Remove( - inter, - interpreter.EmptyLocationRange, - key, - ) - - assert.NotNil(t, actual) - - staticType := key.(interpreter.TypeValue).Type - - var possibleExpectedValues []interpreter.Value - var str string - - switch { - case staticType.Equal(unauthorizedAccountReferenceType): - str = "PublicAccount" - case staticType.Equal(authAccountReferenceType): - str = "AuthAccount" - case staticType.Equal(interpreter.PrimitiveStaticTypeAccount_Capabilities): - // For both `AuthAccount.Capabilities` and `PublicAccount.Capabilities`, - // the migrated key is the same (`Account_Capabilities`). - // So the value at the key could be any of the two original values, - // depending on the order of migration. - possibleExpectedValues = []interpreter.Value{ - interpreter.NewUnmeteredSomeValueNonCopying( - interpreter.NewUnmeteredStringValue("AuthAccountCapabilities"), - ), - interpreter.NewUnmeteredSomeValueNonCopying( - interpreter.NewUnmeteredStringValue("PublicAccountCapabilities"), - ), - } - case staticType.Equal(interpreter.PrimitiveStaticTypeAccount_AccountCapabilities): - str = "AuthAccountAccountCapabilities" - case staticType.Equal(interpreter.PrimitiveStaticTypeAccount_StorageCapabilities): - str = "AuthAccountStorageCapabilities" - case staticType.Equal(interpreter.PrimitiveStaticTypeAccount_Contracts): - // For both `AuthAccount.Contracts` and `PublicAccount.Contracts`, - // the migrated key is the same (Account_Contracts). - // So the value at the key could be any of the two original values, - // depending on the order of migration. - possibleExpectedValues = []interpreter.Value{ - interpreter.NewUnmeteredSomeValueNonCopying( - interpreter.NewUnmeteredStringValue("AuthAccountContracts"), - ), - interpreter.NewUnmeteredSomeValueNonCopying( - interpreter.NewUnmeteredStringValue("PublicAccountContracts"), - ), - } - case staticType.Equal(interpreter.PrimitiveStaticTypeAccount_Keys): - // For both `AuthAccount.Keys` and `PublicAccount.Keys`, - // the migrated key is the same (Account_Keys). - // So the value at the key could be any of the two original values, - // depending on the order of migration. - possibleExpectedValues = []interpreter.Value{ - interpreter.NewUnmeteredSomeValueNonCopying( - interpreter.NewUnmeteredStringValue("AuthAccountKeys"), - ), - interpreter.NewUnmeteredSomeValueNonCopying( - interpreter.NewUnmeteredStringValue("PublicAccountKeys"), - ), - } - case staticType.Equal(interpreter.PrimitiveStaticTypeAccount_Inbox): - str = "AuthAccountInbox" - case staticType.Equal(interpreter.AccountKeyStaticType): - str = "AccountKey" - default: - require.Fail(t, fmt.Sprintf("Unexpected type `%s` in dictionary key", staticType.ID())) - } - - if possibleExpectedValues != nil { - assert.Contains(t, possibleExpectedValues, actual) - } else { - expected := interpreter.NewUnmeteredSomeValueNonCopying( - interpreter.NewUnmeteredStringValue(str), -======= newStorageAndInterpreter := func(t *testing.T) (*runtime.Storage, *interpreter.Interpreter) { storage := runtime.NewStorage(ledger, nil) inter, err := interpreter.NewInterpreter( @@ -1441,7 +1238,6 @@ func TestAccountTypeRehash(t *testing.T) { AtreeValueValidationEnabled: false, AtreeStorageValidationEnabled: true, }, ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) ) require.NoError(t, err) @@ -1489,6 +1285,7 @@ func TestAccountTypeRehash(t *testing.T) { false, nil, nil, + true, // dictValue is standalone ), ) @@ -1553,11 +1350,15 @@ func TestAccountTypeRehash(t *testing.T) { dictValue := storedValue.(*interpreter.DictionaryValue) var existingKeys []interpreter.Value - dictValue.Iterate(inter, func(key, value interpreter.Value) (resume bool) { + dictValue.Iterate( + inter, + interpreter.EmptyLocationRange, + func(key, value interpreter.Value) (resume bool) { existingKeys = append(existingKeys, key) // continue iteration return true - }, interpreter.EmptyLocationRange) + }, + ) require.Len(t, existingKeys, 1) diff --git a/runtime/convertValues.go b/runtime/convertValues.go remerge CONFLICT (content): Merge conflict in runtime/convertValues.go index 1f54f91be..1b68f2ce7 100644 --- a/runtime/convertValues.go +++ b/runtime/convertValues.go @@ -595,14 +595,9 @@ func exportDictionaryValue( }, ) -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) return true }, ) -======= - return true - }, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) if err != nil { return nil, err diff --git a/runtime/interpreter/interpreter.go b/runtime/interpreter/interpreter.go remerge CONFLICT (content): Merge conflict in runtime/interpreter/interpreter.go index 45ba97cec..7886bcb4e 100644 --- a/runtime/interpreter/interpreter.go +++ b/runtime/interpreter/interpreter.go @@ -5244,7 +5244,6 @@ func (interpreter *Interpreter) invalidateReferencedResources( switch value := value.(type) { case *CompositeValue: -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) value.ForEachLoadedField( interpreter, func(_ string, fieldValue Value) (resume bool) { @@ -5252,12 +5251,14 @@ func (interpreter *Interpreter) invalidateReferencedResources( // continue iteration return true }, + locationRange, ) valueID = value.ValueID() case *DictionaryValue: value.IterateLoaded( interpreter, + locationRange, func(_, value Value) (resume bool) { interpreter.invalidateReferencedResources(value, locationRange) return true @@ -5265,20 +5266,6 @@ func (interpreter *Interpreter) invalidateReferencedResources( ) valueID = value.ValueID() -======= - value.ForEachLoadedField(interpreter, func(_ string, fieldValue Value) (resume bool) { - interpreter.invalidateReferencedResources(fieldValue, locationRange) - // continue iteration - return true - }, locationRange) - storageID = value.StorageID() - case *DictionaryValue: - value.IterateLoaded(interpreter, func(_, value Value) (resume bool) { - interpreter.invalidateReferencedResources(value, locationRange) - return true - }, locationRange) - storageID = value.StorageID() ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) case *ArrayValue: value.IterateLoaded( interpreter, @@ -5532,19 +5519,14 @@ func (interpreter *Interpreter) validateMutation(valueID atree.ValueID, location }) } -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) func (interpreter *Interpreter) withMutationPrevention(valueID atree.ValueID, f func()) { - oldIteration, present := interpreter.SharedState.containerValueIteration[valueID] - interpreter.SharedState.containerValueIteration[valueID] = struct{}{} -======= -func (interpreter *Interpreter) withMutationPrevention(storageID atree.StorageID, f func()) { if interpreter == nil { f() return } - oldIteration, present := interpreter.SharedState.containerValueIteration[storageID] - interpreter.SharedState.containerValueIteration[storageID] = struct{}{} ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) + + oldIteration, present := interpreter.SharedState.containerValueIteration[valueID] + interpreter.SharedState.containerValueIteration[valueID] = struct{}{} f() diff --git a/runtime/interpreter/value.go b/runtime/interpreter/value.go remerge CONFLICT (content): Merge conflict in runtime/interpreter/value.go index f89928605..361986fb5 100644 --- a/runtime/interpreter/value.go +++ b/runtime/interpreter/value.go @@ -2236,14 +2236,9 @@ func (v *ArrayValue) Set(interpreter *Interpreter, locationRange LocationRange, interpreter.maybeValidateAtreeStorage() existingValue := StoredValue(interpreter, existingStorable, interpreter.Storage()) -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - + interpreter.checkResourceLoss(existingValue, locationRange) existingValue.DeepRemove(interpreter, true) // existingValue is standalone because it was overwritten in parent container. -======= - interpreter.checkResourceLoss(existingValue, locationRange) - existingValue.DeepRemove(interpreter) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) interpreter.RemoveReferencedSlab(existingStorable) } @@ -2268,15 +2263,6 @@ func (v *ArrayValue) MeteredString(interpreter *Interpreter, seenReferences Seen i := 0 -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - _ = v.array.IterateReadOnly(func(element atree.Value) (resume bool, err error) { - // ok to not meter anything created as part of this iteration, since we will discard the result - // upon creating the string - values[i] = MustConvertUnmeteredStoredValue(element).MeteredString(memoryGauge, seenReferences) - i++ - return true, nil - }) -======= v.Iterate( interpreter, func(value Value) (resume bool) { @@ -2289,7 +2275,6 @@ func (v *ArrayValue) MeteredString(interpreter *Interpreter, seenReferences Seen false, locationRange, ) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) return format.Array(values) } @@ -17424,13 +17409,9 @@ func (v *CompositeValue) SetMemberWithoutTransfer( if existingStorable != nil { existingValue := StoredValue(interpreter, existingStorable, config.Storage) -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - existingValue.DeepRemove(interpreter, true) // existingValue is standalone because it was overwritten in parent container. -======= interpreter.checkResourceLoss(existingValue, locationRange) - existingValue.DeepRemove(interpreter) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) + existingValue.DeepRemove(interpreter, true) // existingValue is standalone because it was overwritten in parent container. interpreter.RemoveReferencedSlab(existingStorable) return true @@ -17486,15 +17467,6 @@ func (v *CompositeValue) MeteredString(interpreter *Interpreter, seenReferences strLen := emptyCompositeStringLen var fields []CompositeField -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - _ = v.dictionary.IterateReadOnly(func(key atree.Value, value atree.Value) (resume bool, err error) { - field := NewCompositeField( - memoryGauge, - string(key.(StringAtreeValue)), - MustConvertStoredValue(memoryGauge, value), - ) -======= ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) v.ForEachField( interpreter, @@ -18207,7 +18179,6 @@ func (v *CompositeValue) ForEachField( f func(fieldName string, fieldValue Value) (resume bool), locationRange LocationRange, ) { -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) iterate := func(fn atree.MapEntryIterationFunc) error { return v.dictionary.Iterate( StringAtreeValueComparator, @@ -18215,10 +18186,12 @@ func (v *CompositeValue) ForEachField( fn, ) } - v.forEachField(gauge, iterate, f) -======= - v.forEachField(interpreter, v.dictionary.Iterate, f, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) + v.forEachField( + interpreter, + iterate, + f, + locationRange, + ) } // ForEachLoadedField iterates over all LOADED field-name field-value pairs of the composite value. @@ -18228,11 +18201,12 @@ func (v *CompositeValue) ForEachLoadedField( f func(fieldName string, fieldValue Value) (resume bool), locationRange LocationRange, ) { -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - v.forEachField(gauge, v.dictionary.IterateReadOnlyLoadedValues, f) -======= - v.forEachField(interpreter, v.dictionary.IterateLoadedValues, f, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) + v.forEachField( + interpreter, + v.dictionary.IterateReadOnlyLoadedValues, + f, + locationRange, + ) } func (v *CompositeValue) forEachField( @@ -18299,12 +18273,8 @@ func (v *CompositeValue) RemoveField( // Value existingValue := StoredValue(interpreter, existingValueStorable, interpreter.Storage()) -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - existingValue.DeepRemove(interpreter, true) // existingValue is standalone because it was removed from parent container. -======= interpreter.checkResourceLoss(existingValue, locationRange) - existingValue.DeepRemove(interpreter) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) + existingValue.DeepRemove(interpreter, true) // existingValue is standalone because it was removed from parent container. interpreter.RemoveReferencedSlab(existingValueStorable) } @@ -18959,7 +18929,6 @@ func (v *DictionaryValue) iterateKeys( interpreter.withMutationPrevention(v.ValueID(), iterate) } -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) func (v *DictionaryValue) IterateReadOnly( interpreter *Interpreter, locationRange LocationRange, @@ -18970,7 +18939,7 @@ func (v *DictionaryValue) IterateReadOnly( fn, ) } - v.iterate(interpreter, iterate, f) + v.iterate(interpreter, iterate, f, locationRange) } func (v *DictionaryValue) Iterate( @@ -18987,26 +18956,20 @@ func (v *DictionaryValue) Iterate( fn, ) } - v.iterate(interpreter, iterate, f) + v.iterate(interpreter, iterate, f, locationRange) } func (v *DictionaryValue) IterateLoaded( interpreter *Interpreter, + locationRange LocationRange, f func(key, value Value) (resume bool), ) { v.iterate( interpreter, v.dictionary.IterateReadOnlyLoadedValues, f, + locationRange, ) -======= -func (v *DictionaryValue) Iterate(interpreter *Interpreter, f func(key, value Value) (resume bool), locationRange LocationRange) { - v.iterate(interpreter, v.dictionary.Iterate, f, locationRange) -} - -func (v *DictionaryValue) IterateLoaded(interpreter *Interpreter, f func(key, value Value) (resume bool), locationRange LocationRange) { - v.iterate(interpreter, v.dictionary.IterateLoadedValues, f, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) } func (v *DictionaryValue) iterate( @@ -19019,8 +18982,6 @@ func (v *DictionaryValue) iterate( err := atreeIterate(func(key, value atree.Value) (resume bool, err error) { // atree.OrderedMap iteration provides low-level atree.Value, // convert to high-level interpreter.Value -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) -======= keyValue := MustConvertStoredValue(interpreter, key) valueValue := MustConvertStoredValue(interpreter, value) @@ -19028,7 +18989,6 @@ func (v *DictionaryValue) iterate( interpreter.checkInvalidatedResourceOrResourceReference(keyValue, locationRange) interpreter.checkInvalidatedResourceOrResourceReference(valueValue, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) resume = f( keyValue, valueValue, @@ -19088,7 +19048,6 @@ func (v *DictionaryValue) Iterator() DictionaryKeyIterator { } func (v *DictionaryValue) Walk(interpreter *Interpreter, walkChild func(Value), locationRange LocationRange) { -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) v.Iterate( interpreter, locationRange, @@ -19098,13 +19057,6 @@ func (v *DictionaryValue) Walk(interpreter *Interpreter, walkChild func(Value), return true }, ) -======= - v.Iterate(interpreter, func(key, value Value) (resume bool) { - walkChild(key) - walkChild(value) - return true - }, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) } func (v *DictionaryValue) StaticType(_ *Interpreter) StaticType { @@ -19124,16 +19076,10 @@ func (v *DictionaryValue) IsImportable(inter *Interpreter, locationRange Locatio return false } -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) // continue iteration return true }, ) -======= - // continue iteration - return true - }, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) return importable } @@ -19185,14 +19131,9 @@ func (v *DictionaryValue) Destroy(interpreter *Interpreter, locationRange Locati maybeDestroy(interpreter, locationRange, key) maybeDestroy(interpreter, locationRange, value) -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) return true }, ) -======= - return true - }, locationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) }, ) @@ -19349,15 +19290,10 @@ func (v *DictionaryValue) MeteredString(interpreter *Interpreter, seenReferences }, v.Count()) index := 0 -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) - _ = v.dictionary.IterateReadOnly(func(key, value atree.Value) (resume bool, err error) { - // atree.OrderedMap iteration provides low-level atree.Value, - // convert to high-level interpreter.Value -======= ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) v.Iterate( interpreter, + locationRange, func(key, value Value) (resume bool) { // atree.OrderedMap iteration provides low-level atree.Value, // convert to high-level interpreter.Value @@ -19372,7 +19308,6 @@ func (v *DictionaryValue) MeteredString(interpreter *Interpreter, seenReferences index++ return true }, - locationRange, ) // len = len(open-brace) + len(close-brace) + (n times colon+space) + ((n-1) times comma+space) diff --git a/runtime/tests/interpreter/values_test.go b/runtime/tests/interpreter/values_test.go remerge CONFLICT (content): Merge conflict in runtime/tests/interpreter/values_test.go index 8ec9db522..90254906a 100644 --- a/runtime/tests/interpreter/values_test.go +++ b/runtime/tests/interpreter/values_test.go @@ -138,16 +138,10 @@ func TestInterpretRandomMapOperations(t *testing.T) { orgValue, ok := entries.get(inter, key) require.True(t, ok, "cannot find key: %v", key) -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) utils.AssertValuesEqual(t, inter, orgValue, value) return true }, ) -======= - utils.AssertValuesEqual(t, inter, orgValue, value) - return true - }, interpreter.EmptyLocationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) }) t.Run("deep copy", func(t *testing.T) { diff --git a/runtime/tests/utils/utils.go b/runtime/tests/utils/utils.go remerge CONFLICT (content): Merge conflict in runtime/tests/utils/utils.go index 56775f86a..2b8c43fea 100644 --- a/runtime/tests/utils/utils.go +++ b/runtime/tests/utils/utils.go @@ -247,14 +247,9 @@ func DictionaryKeyValues(inter *interpreter.Interpreter, dict *interpreter.Dicti result[i*2+1] = value i++ -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) return true }, ) -======= - return true - }, interpreter.EmptyLocationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) return result } @@ -301,25 +296,8 @@ func DictionaryEntries[K, V any]( Value: value, } return iterStatus -<<<<<<< d258aa622 (Merge pull request #3179 from onflow/supun/atree-inlining-merge-master) }, ) -======= - } - - value, ok := fromVal(rawValue) - if !ok { - iterStatus = false - return iterStatus - } - - res[idx] = DictionaryEntry[K, V]{ - Key: key, - Value: value, - } - return iterStatus - }, interpreter.EmptyLocationRange) ->>>>>>> 50d446334 (Merge pull request #3224 from onflow/bastian/composite-value-remove-field-check-resource-loss) return res, iterStatus } diff --git a/tools/storage-explorer/go.mod b/tools/storage-explorer/go.mod index 774def2f6..3de28388a 100644 --- a/tools/storage-explorer/go.mod +++ b/tools/storage-explorer/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/gorilla/mux v1.8.1 - github.com/onflow/atree v0.6.1-0.20240308163425-dc825c20b1a2 + github.com/onflow/atree v0.6.1-0.20240314011440-92714cac03fb github.com/onflow/cadence v1.0.0-M8 github.com/onflow/flow-go v0.34.0-crescendo-preview.5.0.20240229164931-a67398875618 github.com/rs/zerolog v1.32.0 diff --git a/tools/storage-explorer/go.sum b/tools/storage-explorer/go.sum index 70e47d586..b6b2aeb6a 100644 --- a/tools/storage-explorer/go.sum +++ b/tools/storage-explorer/go.sum @@ -1772,8 +1772,8 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= -github.com/onflow/atree v0.6.1-0.20240308163425-dc825c20b1a2 h1:jJLDswfAVB0bHCu1y1FPdKukPcTNmN+jYEX9S9phbv0= -github.com/onflow/atree v0.6.1-0.20240308163425-dc825c20b1a2/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= +github.com/onflow/atree v0.6.1-0.20240314011440-92714cac03fb h1:9w+8wseSv7TZ9ikGfKSZ6yJifgYLhm717Zo0SVKpGEQ= +github.com/onflow/atree v0.6.1-0.20240314011440-92714cac03fb/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A= github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240227190927-0e6ce7e3222b h1:oXHQft30sElpK7G3xWB5tEizI2G+S4p64iVh0LtX4E0=masterbranchFiles changedin the Github PR explorer