From 1acb1d6f70f981a339aff154e867f0bd8faa848c Mon Sep 17 00:00:00 2001 From: protolambda Date: Thu, 18 Mar 2021 00:21:09 +0100 Subject: [PATCH] disable phase1 pyspec build --- setup.py | 62 -------------------------------------------------------- 1 file changed, 62 deletions(-) diff --git a/setup.py b/setup.py index 9de8ef911..91baf978f 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ FUNCTION_REGEX = r'^def [\w_]*' # Definitions in context.py PHASE0 = 'phase0' ALTAIR = 'altair' -PHASE1 = 'phase1' class SpecObject(NamedTuple): @@ -141,40 +140,7 @@ SSZObject = TypeVar('SSZObject', bound=View) CONFIG_NAME = 'mainnet' ''' -PHASE1_IMPORTS = '''from eth2spec.phase0 import spec as phase0 -from eth2spec.config.config_util import apply_constants_config -from typing import ( - Any, Dict, Set, Sequence, NewType, Tuple, TypeVar, Callable, Optional -) -from typing import List as PyList -from dataclasses import ( - dataclass, - field, -) - -from lru import LRU - -from eth2spec.utils.ssz.ssz_impl import hash_tree_root, copy, uint_to_bytes -from eth2spec.utils.ssz.ssz_typing import ( - View, boolean, Container, List, Vector, uint8, uint32, uint64, bit, - ByteList, ByteVector, Bytes1, Bytes4, Bytes32, Bytes48, Bytes96, Bitlist, Bitvector, -) -from eth2spec.utils import bls - -from eth2spec.utils.hash_function import hash - -# Whenever phase 1 is loaded, make sure we have the latest phase0 -from importlib import reload -reload(phase0) - - -SSZVariableName = str -GeneralizedIndex = NewType('GeneralizedIndex', int) -SSZObject = TypeVar('SSZObject', bound=View) - -CONFIG_NAME = 'mainnet' -''' ALTAIR_IMPORTS = '''from eth2spec.phase0 import spec as phase0 from eth2spec.config.config_util import apply_constants_config from typing import ( @@ -294,14 +260,6 @@ get_attesting_indices = cache_this( _get_attesting_indices, lru_size=SLOTS_PER_EPOCH * MAX_COMMITTEES_PER_SLOT * 3)''' -PHASE1_SUNDRY_FUNCTIONS = ''' - -_get_start_shard = get_start_shard -get_start_shard = cache_this( - lambda state, slot: (state.validators.hash_tree_root(), slot), - _get_start_shard, lru_size=SLOTS_PER_EPOCH * 3)''' - - ALTAIR_SUNDRY_FUNCTIONS = ''' def get_generalized_index(ssz_class: Any, *path: Sequence[Union[int, SSZVariableName]]) -> GeneralizedIndex: @@ -327,10 +285,6 @@ def is_altair(fork): return fork == ALTAIR -def is_phase1(fork): - return fork == PHASE1 - - def objects_to_spec(spec_object: SpecObject, imports: str, fork: str, ordered_class_objects: Dict[str, str]) -> str: """ Given all the objects that constitute a spec, combine them into a single pyfile. @@ -370,7 +324,6 @@ def objects_to_spec(spec_object: SpecObject, imports: str, fork: str, ordered_cl # Functions to make pyspec work + '\n' + PHASE0_SUNDRY_FUNCTIONS + ('\n' + ALTAIR_SUNDRY_FUNCTIONS if is_altair(fork) else '') - + ('\n' + PHASE1_SUNDRY_FUNCTIONS if is_phase1(fork) else '') ) # Since some constants are hardcoded in setup.py, the following assertions verify that the hardcoded constants are @@ -461,7 +414,6 @@ def combine_spec_objects(spec0: SpecObject, spec1: SpecObject) -> SpecObject: fork_imports = { 'phase0': PHASE0_IMPORTS, - 'phase1': PHASE1_IMPORTS, 'altair': ALTAIR_IMPORTS, } @@ -515,20 +467,6 @@ class PySpecCommand(Command): specs/phase0/validator.md specs/phase0/weak-subjectivity.md """ - elif is_phase1(self.spec_fork): - self.md_doc_paths = """ - specs/phase0/beacon-chain.md - specs/phase0/fork-choice.md - specs/phase0/validator.md - specs/phase0/weak-subjectivity.md - specs/phase1/custody-game.md - specs/phase1/beacon-chain.md - specs/phase1/shard-transition.md - specs/phase1/fork-choice.md - specs/phase1/fork.md - specs/phase1/shard-fork-choice.md - specs/phase1/validator.md - """ elif is_altair(self.spec_fork): self.md_doc_paths = """ specs/phase0/beacon-chain.md