refactor: extract resolve_block_root to utils and rename misleading test#602
Merged
tcoratger merged 1 commit intoleanEthereum:mainfrom Apr 13, 2026
Conversation
Extract the duplicated _resolve_label closure from StoreChecks and StateExpectation into a shared resolve_block_root function in utils.py. Both validation methods now use a thin _resolve wrapper that delegates to the shared function. Removes the unused hash_tree_root import from state_expectation.py. Rename test_mid_block_resolved_target_does_not_reopen_pending_votes to test_merged_attestations_for_same_target_justify_and_finalize_cleanly. The old name implied the "already-justified skip" guard fires, but the builder merges both attestation specs into one aggregated attestation before processing. The test verifies merging behavior, not the skip path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Summary
Follow-up cleanup to #599.
_resolve_labelclosure into a sharedresolve_block_rootfunction inutils.pyStoreChecksandStateExpectationnow use it via a thin_resolvewrapperhash_tree_rootimport fromstate_expectation.pytest_mid_block_resolved_target_does_not_reopen_pending_votestotest_merged_attestations_for_same_target_justify_and_finalize_cleanly— the old name implied the "already-justified skip" guard fires, but the builder merges both attestation specs into one aggregated attestation before processingTest plan
uvx tox -e all-checkspasses🤖 Generated with Claude Code