rename eth2 pkg to pyspec, per request of hww

.gitignore

@@ -12,4 +12,4 @@ yaml_tests/
 .pytest_cache
 
 # Dynamically built from Markdown spec
-test_libs/pyspec/eth2/phase0/spec.py
+test_libs/pyspec/pyspec/phase0/spec.py

Makefile

@@ -12,18 +12,18 @@ GENERATORS = $(sort $(dir $(wildcard $(GENERATOR_DIR)/*/)))
 YAML_TEST_TARGETS = $(patsubst $(GENERATOR_DIR)/%, $(YAML_TEST_DIR)/%, $(GENERATORS))
 GENERATOR_VENVS = $(patsubst $(GENERATOR_DIR)/%, $(GENERATOR_DIR)/%venv, $(GENERATORS))
 
-PY_SPEC_PHASE_0_TARGETS = $(PY_SPEC_DIR)/eth2/phase0/spec.py
+PY_SPEC_PHASE_0_TARGETS = $(PY_SPEC_DIR)/pyspec/phase0/spec.py
 PY_SPEC_ALL_TARGETS = $(PY_SPEC_PHASE_0_TARGETS)
 
 
 .PHONY: clean all test gen_yaml_tests pyspec phase0
 
-all: $(YAML_TEST_DIR) $(YAML_TEST_TARGETS) $(PY_SPEC_ALL_TARGETS)
+all: $(PY_SPEC_ALL_TARGETS) $(YAML_TEST_DIR) $(YAML_TEST_TARGETS)
 
 clean:
 	rm -rf $(YAML_TEST_DIR)
 	rm -rf $(GENERATOR_VENVS)
-	rm -rf $(PY_TEST_DIR)/venv
+	rm -rf $(PY_TEST_DIR)/venv $(PY_TEST_DIR)/.pytest_cache
 	rm -rf $(PY_SPEC_ALL_TARGETS)
 
 # "make gen_yaml_tests" to run generators
@@ -40,7 +40,7 @@ pyspec: $(PY_SPEC_ALL_TARGETS)
 phase0: $(PY_SPEC_PHASE_0_TARGETS)
 
 
-$(PY_SPEC_DIR)/eth2/phase0/spec.py:
+$(PY_SPEC_DIR)/pyspec/phase0/spec.py:
 	python3 $(SCRIPT_DIR)/phase0/build_spec.py  $(SPEC_DIR)/core/0_beacon-chain.md $@
 
 

py_tests/phase0/block_processing/test_process_attestation.py

@@ -1,12 +1,12 @@
 from copy import deepcopy
 import pytest
 
-import eth2.phase0.spec as spec
+import pyspec.phase0.spec as spec
 
-from eth2.phase0.state_transition import (
+from pyspec.phase0.state_transition import (
     state_transition,
 )
-from eth2.phase0.spec import (
+from pyspec.phase0.spec import (
     get_current_epoch,
     process_attestation,
     slot_to_epoch,

py_tests/phase0/block_processing/test_process_block_header.py

@@ -2,7 +2,7 @@ from copy import deepcopy
 import pytest
 
 
-from eth2.phase0.spec import (
+from pyspec.phase0.spec import (
     get_beacon_proposer_index,
     cache_state,
     advance_slot,

py_tests/phase0/block_processing/test_process_deposit.py

@@ -1,9 +1,9 @@
 from copy import deepcopy
 import pytest
 
-import eth2.phase0.spec as spec
+import pyspec.phase0.spec as spec
 
-from eth2.phase0.spec import (
+from pyspec.phase0.spec import (
     get_balance,
     ZERO_HASH,
     process_deposit,

py_tests/phase0/block_processing/test_process_proposer_slashing.py

@@ -1,8 +1,8 @@
 from copy import deepcopy
 import pytest
 
-import eth2.phase0.spec as spec
-from eth2.phase0.spec import (
+import pyspec.phase0.spec as spec
+from pyspec.phase0.spec import (
     get_balance,
     get_current_epoch,
     process_proposer_slashing,

py_tests/phase0/block_processing/test_voluntary_exit.py

@@ -1,9 +1,9 @@
 from copy import deepcopy
 import pytest
 
-import eth2.phase0.spec as spec
+import pyspec.phase0.spec as spec
 
-from eth2.phase0.spec import (
+from pyspec.phase0.spec import (
     get_active_validator_indices,
     get_current_epoch,
     process_voluntary_exit,

py_tests/phase0/conftest.py

@@ -1,6 +1,6 @@
 import pytest
 
-from eth2.phase0 import spec
+from pyspec.phase0 import spec
 
 from .helpers import (
     create_genesis_state,

py_tests/phase0/helpers.py

@@ -2,9 +2,9 @@ from copy import deepcopy
 
 from py_ecc import bls
 
-import eth2.phase0.spec as spec
-from eth2.utils.minimal_ssz import signed_root
-from eth2.phase0.spec import (
+import pyspec.phase0.spec as spec
+from pyspec.utils.minimal_ssz import signed_root
+from pyspec.phase0.spec import (
     # constants
     EMPTY_SIGNATURE,
     ZERO_HASH,
@@ -33,7 +33,7 @@ from eth2.phase0.spec import (
     verify_merkle_branch,
     hash,
 )
-from eth2.utils.merkle_minimal import (
+from pyspec.utils.merkle_minimal import (
     calc_merkle_tree_from_leaves,
     get_merkle_proof,
     get_merkle_root,

py_tests/phase0/test_sanity.py

@@ -3,10 +3,10 @@ from copy import deepcopy
 import pytest
 
 from py_ecc import bls
-import eth2.phase0.spec as spec
+import pyspec.phase0.spec as spec
 
-from eth2.utils.minimal_ssz import signed_root
-from eth2.phase0.spec import (
+from pyspec.utils.minimal_ssz import signed_root
+from pyspec.phase0.spec import (
     # constants
     EMPTY_SIGNATURE,
     ZERO_HASH,
@@ -27,10 +27,10 @@ from eth2.phase0.spec import (
     verify_merkle_branch,
     hash,
 )
-from eth2.phase0.state_transition import (
+from pyspec.phase0.state_transition import (
     state_transition,
 )
-from eth2.utils.merkle_minimal import (
+from pyspec.utils.merkle_minimal import (
     calc_merkle_tree_from_leaves,
     get_merkle_proof,
     get_merkle_root,

scripts/phase0/build_spec.py

@@ -13,8 +13,8 @@ from typing import (
     NewType,
     Tuple,
 )
-from eth2.utils.minimal_ssz import *
-from eth2.utils.bls_stub import *
+from pyspec.utils.minimal_ssz import *
+from pyspec.utils.bls_stub import *
 
 
     """)

test_generators/README.md

@@ -113,7 +113,7 @@ if __name__ == "__main__":
 And to use the pyspec:
 
 ```
-from eth2.phase0 import spec
+from pyspec.phase0 import spec
 ```
 
 Recommendations:

test_libs/pyspec/README.md

@@ -13,13 +13,13 @@ All the dynamic parts of the spec can be build at once with `make pyspec`.
 
 Alternatively, you can build a sub-set of the pyspec: `make phase0`.
 
-Or, to build a single file, specify the path, e.g. `make test_libs/pyspec/eth2/phase0/spec.py`
+Or, to build a single file, specify the path, e.g. `make test_libs/pyspec/pyspec/phase0/spec.py`
 
 ## Contributing
 
 Contributions are welcome, but consider implementing your idea as part of the spec itself first.
 The pyspec is not a replacement.
-If you see opportunity to include any of the `eth2/utils/` code in the spec,
+If you see opportunity to include any of the `pyspec/utils/` code in the spec,
  please submit an issue or PR.
 
 ## License

test_libs/pyspec/pyspec/debug/jsonize.py

@@ -1,4 +1,4 @@
-from eth2.utils.minimal_ssz import hash_tree_root
+from pyspec.utils.minimal_ssz import hash_tree_root
 
 
 def jsonize(value, typ, include_hash_tree_roots=False):