nit(testing): Move valid_opcodes so merge catches the conflict#2069
Merged
marioevz merged 2 commits intoethereum:eips/amsterdam/eip-7843from Jan 23, 2026
Merged
nit(testing): Move valid_opcodes so merge catches the conflict#2069marioevz merged 2 commits intoethereum:eips/amsterdam/eip-7843from
valid_opcodes so merge catches the conflict#2069marioevz merged 2 commits intoethereum:eips/amsterdam/eip-7843from
Conversation
Member
Author
|
I think we can change the work flow that merges the EIP branches to run Edit: #2071 |
Contributor
That's a great idea 👌🏼 |
spencer-tb
approved these changes
Jan 23, 2026
github-actions bot
pushed a commit
that referenced
this pull request
Jan 23, 2026
* nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## eips/amsterdam/eip-7843 #2069 +/- ##
==========================================================
Coverage ? 86.14%
==========================================================
Files ? 599
Lines ? 39483
Branches ? 3781
==========================================================
Hits ? 34011
Misses ? 4850
Partials ? 622
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
github-actions bot
pushed a commit
that referenced
this pull request
Jan 26, 2026
* nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
marioevz
added a commit
that referenced
this pull request
Jan 29, 2026
* nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
fselmo
pushed a commit
that referenced
this pull request
Feb 3, 2026
* nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
dapplion
pushed a commit
to gnosischain/execution-specs
that referenced
this pull request
Feb 4, 2026
* feat(fork): Add basic Amsterdam fork support * refactor(fork): Move Amsterdam below BPO forks in forks.py
dapplion
pushed a commit
to gnosischain/execution-specs
that referenced
this pull request
Feb 4, 2026
* feat(fork): Add basic Amsterdam fork support * refactor(fork): Move Amsterdam below BPO forks in forks.py
spencer-tb
pushed a commit
that referenced
this pull request
Feb 11, 2026
* nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
fselmo
pushed a commit
to fselmo/execution-specs
that referenced
this pull request
Feb 12, 2026
…ereum#2069) * nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
fselmo
pushed a commit
that referenced
this pull request
Feb 12, 2026
* nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
fselmo
pushed a commit
that referenced
this pull request
Feb 13, 2026
* nit(testing): Move position of `valid_opcodes` so merge catches the conflict * fixup
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
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.
🗒️ Description
Moves
valid_opcodesandopcode_gas_mapto the same place aseips/amsterdam/eip-8024so the conflict is caught during merge instead being automatically resolved by adding both versions of both functions to the class.🔗 Related Issues or PRs
N/A.
✅ Checklist
toxchecks to avoid unnecessary CI fails, see also Code Standards and Enabling Pre-commit Checks:uvx tox -e statictype(scope):.mkdocs servelocally and verified the auto-generated docs for new tests in the Test Case Reference are correctly formatted.@ported_frommarker.Cute Animal Picture