Skip to content

chore(skeleton): replace EdgeSibling with UnmodifiedBottom in original #145

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

Conversation

TzahiTaub
Copy link
Contributor

@TzahiTaub TzahiTaub commented May 26, 2024

This change is Reviewable

@TzahiTaub TzahiTaub self-assigned this May 26, 2024
@codecov-commenter
Copy link

codecov-commenter commented May 26, 2024

Codecov Report

Attention: Patch coverage is 70.00000% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 67.08%. Comparing base (6406580) to head (936ad59).

Files Patch % Lines
...ted_skeleton_tree/compute_updated_skeleton_tree.rs 25.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #145      +/-   ##
==========================================
+ Coverage   66.53%   67.08%   +0.54%     
==========================================
  Files          35       35              
  Lines        1294     1276      -18     
  Branches     1294     1276      -18     
==========================================
- Hits          861      856       -5     
+ Misses        393      380      -13     
  Partials       40       40              

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

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 6 of 6 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @TzahiTaub)


crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs line 149 at r1 (raw file):

                        );
                        self.nodes.insert(
                            subtree.root_index,

wrong index (need root_index + path)

Code quote:

subtree.root_index

@TzahiTaub TzahiTaub force-pushed the tzahi/skeleton/replace_edge_sibling_with_unmodified_bottom_in_original branch from b3f1225 to 936ad59 Compare May 26, 2024 11:00
Copy link
Contributor Author

@TzahiTaub TzahiTaub left a comment

Choose a reason for hiding this comment

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

Reviewable status: 4 of 6 files reviewed, 1 unresolved discussion (waiting on @dorimedini-starkware and @nimrod-starkware)


crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs line 149 at r1 (raw file):

Previously, dorimedini-starkware wrote…

wrong index (need root_index + path)

Oops. OK, actually looked at the surrounding code as well :)
The testing of this was accidentally forgotten, I talked with @nimrod-starkware and added a todo.

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.

:lgtm:

Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @TzahiTaub)


crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs line 149 at r1 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

Oops. OK, actually looked at the surrounding code as well :)
The testing of this was accidentally forgotten, I talked with @nimrod-starkware and added a todo.

wait, why is the root index node inserted now, even if the subtree is not a sibling? why wasn't it inserted before, actually? missing test?

Copy link
Contributor Author

@TzahiTaub TzahiTaub left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @TzahiTaub)


crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs line 149 at r1 (raw file):

Previously, dorimedini-starkware wrote…

wait, why is the root index node inserted now, even if the subtree is not a sibling? why wasn't it inserted before, actually? missing test?

I'm not sure I understand - it as inserted as an edge when it's not a sibling (the deleted chunk under //Parse bottom

Copy link
Contributor Author

@TzahiTaub TzahiTaub left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @TzahiTaub)


crates/committer/src/patricia_merkle_tree/original_skeleton_tree/create_tree.rs line 149 at r1 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

I'm not sure I understand - it as inserted as an edge when it's not a sibling (the deleted chunk under //Parse bottom

*was

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.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @TzahiTaub)

@TzahiTaub TzahiTaub added this pull request to the merge queue May 26, 2024
Merged via the queue into main with commit 698f7b1 May 26, 2024
11 checks passed
@TzahiTaub TzahiTaub deleted the tzahi/skeleton/replace_edge_sibling_with_unmodified_bottom_in_original branch May 26, 2024 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants