rpc/jsonrpc: trim the over-engineering left by #23690 - #23725
Merged
Conversation
Six sites from an over-engineering review pass on #23690. - receiptsRetiredWithHistory is inlined as `!amount.Enabled()`: both call sites are the second arm of a switch whose first arm already handles KeepAllReceiptsPruneMode, and both hold `amount` in scope. - TestCapabilitiesFollowHistoryForASentinelRetention becomes a pruneGatingConfigs row, which TestCapabilitiesAgreeWithGates pins against the gate more tightly than the deleted test did. - The two new receipts test files become one test next to the helpers they use, pinning the pre-semaphore answer and the cache together. - The resolveLogsRange leg, and three docstrings that restate their name or belong in a commit message, are dropped. No behavior change, so no new test: the existing suite covers it.
AskAlexSharov
approved these changes
Sep 2, 2026
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
2 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.
Follow-up to #23690, from an over-engineering review pass on it. No behavior change.
eth_api.go,eth_system.goreceiptsRetiredWithHistoryinlined as!amount.Enabled()— both call sites are the second arm of a switch whose first arm already handlesKeepAllReceiptsPruneModecheck_prune_gates_test.go,prune_gating_test.goTestCapabilitiesFollowHistoryForASentinelRetention→ apruneGatingConfigsrow;TestCapabilitiesAgreeWithGatespins it against the gate more tightlyreceipts/check_prune_gates_test.goresolveLogsRangeleg dropped — nothing reaches the resolver except the two legs above iteth_api.go,erigon_receipts_test.goNet −110 lines. No new test: pure inlining and test consolidation, covered by the existing suite.