Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v0.37] Port internal fixes #6937

Merged
merged 14 commits into from
Jan 28, 2025
Merged

[v0.37] Port internal fixes #6937

merged 14 commits into from
Jan 28, 2025

Conversation

turbolent
Copy link
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 j1010001 and a team January 27, 2025 19:28
@turbolent turbolent self-assigned this Jan 27, 2025
@codecov-commenter
Copy link

codecov-commenter commented Jan 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 41.44%. Comparing base (dbe46e6) to head (5ed0248).

Additional details and impacted files
@@            Coverage Diff             @@
##            v0.37    #6937      +/-   ##
==========================================
- Coverage   41.44%   41.44%   -0.01%     
==========================================
  Files        2036     2036              
  Lines      181784   181784              
==========================================
- Hits        75349    75336      -13     
- Misses     100194   100206      +12     
- Partials     6241     6242       +1     
Flag Coverage Δ
unittests 41.44% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@turbolent turbolent requested a review from a team January 27, 2025 19:40
@turbolent
Copy link
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
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
55 checks passed
@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