Merge v1.10#4513
Merged
Merged
Conversation
… into supun/fix-capability-entitlement-stripping
…ternal into supun/fix-capability-entitlement-stripping
…stripping Do not strip entitlements when capabilities are assigned to `AnyStruct`
… into bastian/forbid-mapping-access-non-fields
…ternal into supun/fix-switch-statement
Temporarily disable go module cache
… into bastian/forbid-mapping-access-non-fields
…-fields Forbid mapping access modifier on non-field members
…ternal into supun/fix-switch-statement
Implicitly unbox values in switch-statement similar to == operator
…eachable-statement Add defensive panic after statements ending control flow
Review of v1.10.4-rc / follow-up
Canonicalize Cadence wrappers for atree containers (Array/Dictionary/Composite)
…e invoked from there against the same storage
…16.1-rc.2 Update to internal atree v0.16.1-rc.2
Add more defensive checks
…ation-context Pass the invocation context to CreateAccount to allow re-entrant contract function calls
Recursively canonicalize SomeValue inner values when a stored container element is converted through MustConvertStoredContainerElement. This closes the gap where an optional-wrapped array, dictionary, or composite could produce distinct Cadence wrappers even though direct container reads were canonicalized. Add a Cadence-level regression that compares references taken through an optional container element, plus focused Go-level cache tests for single and nested SomeValue wrappers. Update transfer tests to pass the interpreter context into ArrayValue.Get instead of nil, so canonicalizing reads always have a container cache.
…er-elements Canonicalize optional container elements
…16.1-rc.3 Update to internal atree v0.16.1-rc.3
[v1.10] Update to atree v0.16.1
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.OpenSSF Scorecard
Scanned Files
|
Benchstat comparison
Results
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Member
Author
|
There was only one small conflict, both sides adding tests at the end of a file, which could be trivially resolved: diff --git a/interpreter/switch_test.go b/interpreter/switch_test.go
remerge CONFLICT (content): Merge conflict in interpreter/switch_test.go
index ca731b8e6..7c4a36fc2 100644
--- a/interpreter/switch_test.go
+++ b/interpreter/switch_test.go
@@ -235,7 +235,6 @@ func TestInterpretSwitchStatement(t *testing.T) {
})
}
-<<<<<<< 3fa2a11ef (Merge pull request #4510 from onflow/bastian/feature-inventory)
func TestInterpretSwitchStatementControlFlowInLoop(t *testing.T) {
t.Parallel()
@@ -388,7 +387,10 @@ func TestInterpretSwitchStatementControlFlowInLoop(t *testing.T) {
}
`,
6,
-=======
+ )
+ })
+}
+
func TestInterpretSwitchStatementOptionalUnboxing(t *testing.T) {
t.Parallel()
@@ -532,7 +534,6 @@ func TestInterpretSwitchStatementOptionalUnboxing(t *testing.T) {
invokable,
interpreter.NewUnmeteredStringValue("nil"),
result,
->>>>>>> d01300fc3 (Merge pull request #4512 from onflow/bastian/update-atree-v0.16.1)
)
})
} |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
masterbranchFiles changedin the Github PR explorer