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.

Sign up for GitHub

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

Jump to bottom

Merge main-v0.13.2 into main #217

Merged
merged 15 commits into from
Jul 31, 2024
Merged

Merge main-v0.13.2 into main #217

merged 15 commits into from
Jul 31, 2024

Conversation

dan-starkware
Copy link
Collaborator

@dan-starkware dan-starkware commented Jul 31, 2024 •
edited by alon-dotan-starkware
Loading

This change is Reviewable

AvivYossef-starkware and others added 12 commits July 29, 2024 13:58
@AvivYossef-starkware
refactor: committer create tree test (#133)
a0b2115 
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/starkware-libs/sequencer/133)
<!-- Reviewable:end -->
@dorimedini-starkware
chore: add taplo (#85)
c7871b4 
Signed-off-by: Dori Medini <[email protected]>
@dorimedini-starkware
fix: ascii art spacing (#119)
cebfa75 
Signed-off-by: Dori Medini <[email protected]>
@dorimedini-starkware
chore(ci): remove duplicate Machete CI job (#118)
8563161 
Signed-off-by: Dori Medini <[email protected]>
@dorimedini-starkware
chore(ci): add blockifier scope to commitlint (#185)
97f6673 
Signed-off-by: Dori Medini <[email protected]>
@dorimedini-starkware
chore(ci): add timestamp in forward-merge branch to prevent collisions (
22f4958 
#191)

Signed-off-by: Dori Medini <[email protected]>
@dorimedini-starkware
chore(ci): fix commitlint PR title check for forward-merge (#192)
13b2edf 
Signed-off-by: Dori Medini <[email protected]>
@aner-starkware
test: add threads to regression test (#144)
4c56977 
* test: add threads to regression test

* test: add file printout in case of failure
@dorimedini-starkware
chore(ci): more informative merge_status.py output (#211)
5e95948 
Signed-off-by: Dori Medini <[email protected]>
@amosStarkware
fix: silence clippy (#212)
9e9e1cf
@dorimedini-starkware
fix: add missing config.toml (#193)
f85876d 
Signed-off-by: Dori Medini <[email protected]>
@dan-starkware
chore: merge branch main-v0.13.2 into main (with conflicts)
4f9a8d8
@dan-starkware
Copy link
Collaborator Author

Src Dst Cargo.toml
Src Dst crates/mempool_types/Cargo.toml
Src Dst crates/papyrus_network/Cargo.toml

dan-starkware
dan-starkware commented Jul 31, 2024
View reviewed changes
Copy link
Collaborator Author

@dan-starkware dan-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 22 of 30 files at r2, 2 of 2 files at r3, 1 of 1 files at r6, 1 of 1 files at r7, 2 of 3 files at r8, 1 of 1 files at r9, 1 of 1 files at r10, 3 of 3 files at r11, 8 of 8 files at r12, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dan-starkware)

@dorimedini-starkware
fix: conflict resolution
41810e8 
Signed-off-by: Dori Medini <[email protected]>
@dorimedini-starkware dorimedini-starkware force-pushed the dan/merge-main-v0.13.2-into-main-1722412479 branch from ddffdd8 to 41810e8 Compare July 31, 2024 08:51
@codecov Codecov
Copy link

codecov bot commented Jul 31, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 76.74%. Comparing base (16e1be5) to head (70e64a7).
Report is 1 commits behind head on main.

Files Patch % Lines
...r/src/patricia_merkle_tree/node_data/inner_node.rs 0.00% 2 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #217      +/-   ##
==========================================
+ Coverage   76.72%   76.74%   +0.01%     
==========================================
  Files         311      311              
  Lines       34348    34348              
  Branches    34348    34348              
==========================================
+ Hits        26354    26360       +6     
+ Misses       5704     5700       -4     
+ Partials     2290     2288       -2

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

@dorimedini-starkware dorimedini-starkware self-assigned this Jul 31, 2024
ShahakShama
ShahakShama approved these changes Jul 31, 2024
View reviewed changes
Copy link
Contributor

@ShahakShama ShahakShama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 3 of 3 files at r15, 2 of 2 files at r16, 1 of 1 files at r17, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dafnamatsry)

dorimedini-starkware
dorimedini-starkware approved these changes Jul 31, 2024
View reviewed changes
Copy link
Collaborator

@dorimedini-starkware dorimedini-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dafnamatsry)

@dorimedini-starkware dorimedini-starkware merged commit 20479ec into main Jul 31, 2024
28 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dorimedini-starkware dorimedini-starkware dorimedini-starkware approved these changes

@ShahakShama ShahakShama ShahakShama approved these changes

@dafnamatsry dafnamatsry Awaiting requested review from dafnamatsry

Assignees

@dorimedini-starkware dorimedini-starkware

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dan-starkware @ShahakShama @dorimedini-starkware @AvivYossef-starkware @aner-starkware @amosStarkware