Skip to content

Commit

Permalink
Handle merge->shanghai transition tests properly
Browse files Browse the repository at this point in the history
  • Loading branch information
fselmo committed Mar 1, 2023
1 parent 2ba6850 commit 984f264
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions eth/tools/fixtures/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,12 @@ def chain_vm_configuration(fixture: Dict[str, Any]) -> Iterable[Tuple[int, Type[
(0, GrayGlacierVM),
(6, ParisVM),
)
elif network == "MergeToShanghaiAtTime15k":
# Transition expected at 5 (timestamp==15000) for all tests written thus far
return (
(0, ParisVM),
(5, ShanghaiVM),
)

else:
raise ValueError(f"Network {network} does not match any known VM rules")
Expand Down

0 comments on commit 984f264

Please sign in to comment.