dev: change type of branch node subnodes#1066
Merged
SamWilsn merged 10 commits intoethereum:masterfrom Jan 25, 2025
Merged
Conversation
enitrat
force-pushed
the
dev/change-type-branch-nodes
branch
from
bcef93c to
2a3b61a
Compare
Contributor
|
Does the annotation get enforced? If not, I'd prefer the tuple with 16 elements, probably as a proper type or type alias. |
Contributor
Author
|
The Annotation is not enforced. It's only a "hint" for the reader that it expects 16 elements. We could create a proper type that Perhaps something like: |
Contributor
|
Kinda ugly, but I don't see a shorter way of making the type annotation meaningful to mypy. Let's go with the sixteen |
Contributor
Author
|
done :) |
SamWilsn
approved these changes
Dec 30, 2024
Contributor
Author
|
Hi @SamWilsn, any chance you can help me understand why CI is failing ? |
Contributor
|
Re-ran it and it seems to be passing now. The error wasn't something I've ever seen before, so I'm hoping it's just something weird on our github runner. |
SamWilsn
reviewed
Jan 7, 2025
Contributor
|
I think avoiding the |
Contributor
Author
|
merged it @SamWilsn :) |
Contributor
|
This passed for me. I'll dig into this a bit. I bet it's something to do with my local Python version. |
Contributor
|
Fixed: kkrt-labs#2 |
SamWilsn
added a commit
to SamWilsn/eth1.0-specs
that referenced
this pull request
Jan 25, 2025
SamWilsn
added a commit
to SamWilsn/eth1.0-specs
that referenced
this pull request
Jan 27, 2025
SamWilsn
added a commit
that referenced
this pull request
Jan 27, 2025
SamWilsn
added a commit
to SamWilsn/eth1.0-specs
that referenced
this pull request
Mar 5, 2025
* dev: change type of branch node subnodes * Annotate tuple with 16 * add ellipsis to tuple * explicit tuple * use explicit 16-field tuple * fmt * remove Annotated import * fix types * Use assert_type alongside cast (#1) * Import from typing_extensions instead of typing (#2) --------- Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>
Shashwat-Nautiyal
pushed a commit
to Shashwat-Nautiyal/execution-specs
that referenced
this pull request
Mar 17, 2025
* dev: change type of branch node subnodes * Annotate tuple with 16 * add ellipsis to tuple * explicit tuple * use explicit 16-field tuple * fmt * remove Annotated import * fix types * Use assert_type alongside cast (ethereum#1) * Import from typing_extensions instead of typing (ethereum#2) --------- Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>
Shashwat-Nautiyal
pushed a commit
to Shashwat-Nautiyal/execution-specs
that referenced
this pull request
Mar 20, 2025
* dev: change type of branch node subnodes * Annotate tuple with 16 * add ellipsis to tuple * explicit tuple * use explicit 16-field tuple * fmt * remove Annotated import * fix types * Use assert_type alongside cast (ethereum#1) * Import from typing_extensions instead of typing (ethereum#2) --------- Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>
fselmo
pushed a commit
to fselmo/execution-specs
that referenced
this pull request
Apr 9, 2025
SamWilsn
added a commit
to SamWilsn/eth1.0-specs
that referenced
this pull request
Apr 11, 2025
SamWilsn
added a commit
that referenced
this pull request
May 15, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What was wrong?
The type for the BranchNode's subnodes was
List[rlp.Extended]. While this is not inherently wrong, a more suitable type would be a tuple with 16 rlp.Extended elements, each representing a BranchNode of the trie, as there's no intent to mutate the subnodes after instantiation.Related to Issue #
How was it fixed?
Changed to
Annotated[Tuple[rlp.Extended, ...], 16]. Also open to just repeating 16 times the rlp.Extended argument, but using an annotation sounds more convenient rather than repeating. The annotation conveys at type hint that the tuple is of size 16.Cute Animal Picture
Our beloved moodeng friend
