Update for Cadence integration for atree inlining and deduplication #352
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
Some errors that should be returned as external error are being returned as fatal error. This caused a problem that was detected during Cadence integration. This commit resolves the problem by returning these fatal errors as external errors.
Some errors that should be returned as external error are being returned as fatal error. This caused a problem that was detected during Cadence integration. This commit resolves the problem by returning these fatal errors as external errors.
Cadence integration requires InlinedExtraData interface.
ContainerStorable interface supports encoding container storable (storable containing other storables) as element. This is needed for integration with Cadence.
This is needed for integration with Cadence because map key can be Cadence enums.
fxamacker
added
enhancement
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## fxamacker/add-composite-type-to-smoke-test #352 +/- ##
==============================================================================
+ Coverage 62.56% 62.58% +0.01%
==============================================================================
Files 15 15
Lines 10566 10602 +36
==============================================================================
+ Hits 6611 6635 +24
- Misses 3010 3016 +6
- Partials 945 951 +6
☔ View full report in Codecov by Sentry. |
This was referenced Oct 19, 2023
turbolent
approved these changes
Oct 20, 2023
Comment on lines
+535
to
+539
| // Skip verification of inlined array serialization. | ||
| if a.Inlined() { | ||
| return nil | ||
| } | ||
|
|
There was a problem hiding this comment.
Are inlined arrays verified somewhere else? If this skips verification of them in general, maybe it would be good to add that too, just to be safe (maybe just in a follow-up PR, not a blocker)
There was a problem hiding this comment.
Are inlined arrays verified somewhere else?
Yes, inlined arrays and maps are verified when their parent is verified. The serialization verification is done at slab level so round-trip serialization is tested, as well as elements in the slabs.
Comment on lines
+947
to
+950
| // Skip verification of inlined map serialization. | ||
| if m.Inlined() { | ||
| return nil | ||
| } |
fxamacker
merged commit 81a8e2d
into
fxamacker/add-composite-type-to-smoke-test
3 checks passed
11 tasks
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.
Closes #351
Updates #292 onflow/cadence#2809 onflow/flow-go#1744
This PR adds new interfaces, changes error types, exports new functions, etc. This is to resolve all the integration issues integration issues I ran into while updating onflow/cadence to use Atree PR #342 and #345.
Changes:
TypeInfo.ID()toTypeInfo.Identifier()InlinedExtraDatainterfaceContainerStorableinterfaceEncodetoEncodeSlabEncodeStorableAsElement()ContainerStorable.HasPointer()mainbranchFiles changedin the Github PR explorer