Skip to content

nit(testing): Move valid_opcodes so merge catches the conflict#2069

Merged
marioevz merged 2 commits intoethereum:eips/amsterdam/eip-7843from
marioevz:nit-forks-py
Jan 23, 2026
Merged

nit(testing): Move valid_opcodes so merge catches the conflict#2069
marioevz merged 2 commits intoethereum:eips/amsterdam/eip-7843from
marioevz:nit-forks-py

Conversation

@marioevz
Copy link
Member

🗒️ Description

Moves valid_opcodes and opcode_gas_map to the same place as eips/amsterdam/eip-8024 so 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

  • All: Ran fast tox checks to avoid unnecessary CI fails, see also Code Standards and Enabling Pre-commit Checks:
    uvx tox -e static
  • All: PR title adheres to the repo standard - it will be used as the squash commit message and should start type(scope):.
  • All: Considered updating the online docs in the ./docs/ directory.
  • All: Set appropriate labels for the changes (only maintainers can apply labels).
  • Tests: Ran mkdocs serve locally and verified the auto-generated docs for new tests in the Test Case Reference are correctly formatted.
  • Tests: For PRs implementing a missed test case, update the post-mortem document to add an entry the list.
  • Ported Tests: All converted JSON/YML tests from ethereum/tests or tests/static have been assigned @ported_from marker.

Cute Animal Picture

Put a link to a cute animal picture inside the parenthesis-->

@marioevz
Copy link
Member Author

marioevz commented Jan 23, 2026

I think we can change the work flow that merges the EIP branches to run static tox flow on the result. That would've caught it.

Edit: #2071

Copy link
Contributor

@fselmo fselmo left a comment

Choose a reason for hiding this comment

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

Ah, makes sense 👍🏼

@fselmo
Copy link
Contributor

fselmo commented Jan 23, 2026

I think we can change the work flow that merges the EIP branches to run static tox flow on the result. That would've caught it.

That's a great idea 👌🏼

@marioevz marioevz merged commit 763ca7a into ethereum:eips/amsterdam/eip-7843 Jan 23, 2026
16 checks passed
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
Copy link

codecov bot commented Jan 23, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (eips/amsterdam/eip-7843@88515e6). Learn more about missing BASE report.

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           
Flag Coverage Δ
unittests 86.14% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

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
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.

3 participants