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

commitment: clarify update kind based on afterMap #13348

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Conversation

awskii
Copy link
Member

@awskii awskii commented Jan 8, 2025

Closes #13235

@awskii awskii added this to the 3.0.0-beta1 milestone Jan 8, 2025
@awskii awskii requested a review from antonis19 January 10, 2025 13:08
@awskii awskii enabled auto-merge (squash) January 10, 2025 13:12
@@ -1682,7 +1719,7 @@ func (hph *HexPatriciaHashed) fold() (err error) {
}

// Calculate total length of all hashes
totalBranchLen := 17 - partsCount // For every empty cell, one byte
totalBranchLen := 17 - nibblesLeftAfterUpdate // For every empty cell, one byte
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't totalBranchLen be renamed to emptyCellsInBranchLen ?

Copy link
Member Author

Choose a reason for hiding this comment

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

this is branch len, counting not only amount of empty cells, but we initialize it with that value. Later we add to this len 33 bytes for each existing cell (so 0xa0[roothash]).

Copy link
Member Author

Choose a reason for hiding this comment

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

so rename is incorrect and not needed

Copy link
Member

@antonis19 antonis19 Jan 10, 2025

Choose a reason for hiding this comment

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

How is the rename incorrect when it is counting the number of 1's in the afterMap bitmap ? 17 - number of 1's == number of 0s , right?

Copy link
Member Author

Choose a reason for hiding this comment

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

just read code block till the end and you can see that this variable is not just count of empty cells.

@awskii awskii merged commit e2563f8 into main Jan 13, 2025
13 checks passed
@awskii awskii deleted the commit-fold-parts-enum branch January 13, 2025 13:54
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.

commitment: replace fold heuristic by func/method
3 participants