Skip to content

Commit

Permalink
Replace epbs with eipxxxx
Browse files Browse the repository at this point in the history
  • Loading branch information
terencechain committed Jun 25, 2024
1 parent 10dd861 commit ad4e0f0
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Mainnet preset - epbs
# Mainnet preset - EIPXXXX

# Execution
# ---------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Minimal preset - epbs
# Minimal preset - EIPXXXX

# Execution
# ---------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pysetup/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
EIP7594 = 'eip7594'
EIP6800 = 'eip6800'
WHISK = 'whisk'
EPBS = 'epbs'
EIPXXXX = 'eipxxxx'


# The helper functions that are used when defining constants
Expand Down
4 changes: 2 additions & 2 deletions pysetup/md_doc_paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
WHISK,
EIP7594,
EIP6800,
EPBS,
EIPXXXX,
)


Expand All @@ -24,7 +24,7 @@
WHISK: CAPELLA,
EIP7594: DENEB,
EIP6800: DENEB,
EPBS: ELECTRA,
EIPXXXX: ELECTRA,
}

ALL_FORKS = list(PREVIOUS_FORK_OF.keys())
Expand Down
4 changes: 2 additions & 2 deletions pysetup/spec_builders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
from .whisk import WhiskSpecBuilder
from .eip7594 import EIP7594SpecBuilder
from .eip6800 import EIP6800SpecBuilder
from .epbs import EPBSSpecBuilder
from .eipxxxx import EIPXXXXSpecBuilder


spec_builders = {
builder.fork: builder
for builder in (
Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP6800SpecBuilder, EPBSSpecBuilder,
ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP6800SpecBuilder, EIPXXXXSpecBuilder,
)
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
from typing import Dict

from .base import BaseSpecBuilder
from ..constants import EPBS
from ..constants import EIPXXXX


class EPBSSpecBuilder(BaseSpecBuilder):
fork: str = EPBS
class EIPXXXXSpecBuilder(BaseSpecBuilder):
fork: str = EIPXXXX

@classmethod
def imports(cls, preset_name: str):
return f'''
from eth2spec.epbs import {preset_name} as epbs
from eth2spec.eipxxxx import {preset_name} as eipxxxx
'''

@classmethod
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions tests/core/pyspec/eth2spec/test/helpers/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
ELECTRA = SpecForkName('electra')
WHISK = SpecForkName('whisk')
EIP7594 = SpecForkName('eip7594')
EPBS = SpecForkName('epbs')
EIPXXXX = SpecForkName('eipxxxx')

#
# SpecFork settings
Expand All @@ -38,12 +38,12 @@
ELECTRA,
# Experimental patches
EIP7594,
EPBS,
EIPXXXX,
)
# The forks that have light client specs
LIGHT_CLIENT_TESTING_FORKS = (*[item for item in MAINNET_FORKS if item != PHASE0],)
# The forks that output to the test vectors.
TESTGEN_FORKS = (*MAINNET_FORKS, ELECTRA, EIP7594, WHISK, EPBS)
TESTGEN_FORKS = (*MAINNET_FORKS, ELECTRA, EIP7594, WHISK, EIPXXXX)
# Forks allowed in the test runner `--fork` flag, to fail fast in case of typos
ALLOWED_TEST_RUNNER_FORKS = (*ALL_PHASES, WHISK)

Expand All @@ -59,7 +59,7 @@
# Experimental patches
WHISK: CAPELLA,
EIP7594: DENEB,
EPBS: ELECTRA,
EIPXXXX: ELECTRA,
}

# For fork transition tests
Expand All @@ -70,7 +70,7 @@
BELLATRIX: CAPELLA,
CAPELLA: DENEB,
DENEB: ELECTRA,
ELECTRA: EPBS,
ELECTRA: EIPXXXX,
}

ALL_PRE_POST_FORKS = POST_FORK_OF.items()
Expand Down

0 comments on commit ad4e0f0

Please sign in to comment.