Skip to content

[v0.37] Port internal fixes#6937

Merged
turbolent merged 14 commits into
v0.37from
bastian/port-internal-fixes
Jan 28, 2025
Merged

[v0.37] Port internal fixes#6937
turbolent merged 14 commits into
v0.37from
bastian/port-internal-fixes

Conversation

@turbolent
Copy link
Copy Markdown
Member

Port https://github.com/onflow/flow-go-internal/compare/v0.37-public...v0.37

Effectively updates to Cadence v1.0.4 and atree v0.9.0

@turbolent turbolent requested review from a team and j1010001 January 27, 2025 19:28
@turbolent turbolent self-assigned this Jan 27, 2025
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jan 27, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@turbolent turbolent requested a review from a team January 27, 2025 19:40
@turbolent
Copy link
Copy Markdown
Member Author

turbolent commented Jan 27, 2025

One unrelated unit test, TestProtocolStateEntry_Copy, seems to fail, likely because of the update of testify (we had similar issues on master)

NotSame checks pointer inequality; the input was not a pointer. This
caused a failure once testify was updated to explicitly catch and throw
an error in this case.
@turbolent
Copy link
Copy Markdown
Member Author

Cherry-picked @jordanschalm's fix: #6779 (comment)

@j1010001 j1010001 requested a review from zhangchiqing January 27, 2025 22:46
@j1010001 j1010001 mentioned this pull request Jan 28, 2025
@turbolent turbolent merged commit 5f6b25b into v0.37 Jan 28, 2025
@turbolent turbolent deleted the bastian/port-internal-fixes branch January 28, 2025 01:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants