Merge conflicts on dev

Zkx007 · Jun 18, 2019 · 31a4700 · 31a4700
2 parents c31a426 + a1ca0f8
commit 31a4700
Show file tree

Hide file tree

Showing 40 changed files with 595 additions and 464 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,10 @@ eth2.0-spec-tests/
 # Dynamically built from Markdown spec
 test_libs/pyspec/eth2spec/phase0/spec.py
 test_libs/pyspec/eth2spec/phase1/spec.py
+
+# coverage reports
+.htmlcov
+.coverage
+
+# local CI testing output
+test_libs/pyspec/test-reports
diff --git a/Makefile b/Makefile
@@ -21,8 +21,11 @@ PY_SPEC_PHASE_1_DEPS = $(SPEC_DIR)/core/1_*.md
 
 PY_SPEC_ALL_TARGETS = $(PY_SPEC_PHASE_0_TARGETS) $(PY_SPEC_PHASE_1_TARGETS)
 
+COV_HTML_OUT=.htmlcov
+COV_INDEX_FILE=$(PY_SPEC_DIR)/$(COV_HTML_OUT)/index.html
 
-.PHONY: clean all test citest lint gen_yaml_tests pyspec phase0 phase1 install_test install_deposit_contract_test test_deposit_contract compile_deposit_contract 
+.PHONY: clean all test citest lint gen_yaml_tests pyspec phase0 phase1 install_test open_cov \
+        install_deposit_contract_test test_deposit_contract compile_deposit_contract
 
 all: $(PY_SPEC_ALL_TARGETS) $(YAML_TEST_DIR) $(YAML_TEST_TARGETS)
 
@@ -32,6 +35,9 @@ clean:
 	rm -rf $(PY_SPEC_DIR)/venv $(PY_SPEC_DIR)/.pytest_cache
 	rm -rf $(PY_SPEC_ALL_TARGETS)
 	rm -rf $(DEPOSIT_CONTRACT_DIR)/venv $(DEPOSIT_CONTRACT_DIR)/.pytest_cache
+	rm -rf $(PY_SPEC_DIR)/$(COV_HTML_OUT)
+	rm -rf $(PY_SPEC_DIR)/.coverage
+	rm -rf $(PY_SPEC_DIR)/test-reports
 
 # "make gen_yaml_tests" to run generators
 gen_yaml_tests: $(PY_SPEC_ALL_TARGETS) $(YAML_TEST_TARGETS)
@@ -41,11 +47,15 @@ install_test:
 	cd $(PY_SPEC_DIR); python3 -m venv venv; . venv/bin/activate; pip3 install -r requirements-testing.txt;
 
 test: $(PY_SPEC_ALL_TARGETS)
-	cd $(PY_SPEC_DIR); . venv/bin/activate; python -m pytest eth2spec
+	cd $(PY_SPEC_DIR); . venv/bin/activate;	export PYTHONPATH="./"; \
+	python -m pytest --cov=eth2spec.phase0.spec --cov=eth2spec.phase1.spec --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
 
 citest: $(PY_SPEC_ALL_TARGETS)
-	cd $(PY_SPEC_DIR); mkdir -p test-reports/eth2spec; . venv/bin/activate;	\
-	python -m pytest --junitxml=test-reports/eth2spec/test_results_phase0.xml eth2spec
+	cd $(PY_SPEC_DIR); mkdir -p test-reports/eth2spec; . venv/bin/activate; \
+	python -m pytest --junitxml=test-reports/eth2spec/test_results.xml eth2spec
+
+open_cov:
+	((open "$(COV_INDEX_FILE)" || xdg-open "$(COV_INDEX_FILE)") &> /dev/null) &
 
 lint: $(PY_SPEC_ALL_TARGETS)
 	cd $(PY_SPEC_DIR); . venv/bin/activate; \

diff --git a/configs/constant_presets/mainnet.yaml b/configs/constant_presets/mainnet.yaml
@@ -15,8 +15,6 @@ MAX_INDICES_PER_ATTESTATION: 4096
 MIN_PER_EPOCH_CHURN_LIMIT: 4
 # 2**16 (= 65,536)
 CHURN_LIMIT_QUOTIENT: 65536
-# Normalizes base rewards
-BASE_REWARDS_PER_EPOCH: 5
 # See issue 563
 SHUFFLE_ROUND_COUNT: 90
 
@@ -25,8 +23,6 @@ SHUFFLE_ROUND_COUNT: 90
 # ---------------------------------------------------------------
 # **TBD**
 DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
-# 2**5 (= 32)
-DEPOSIT_CONTRACT_TREE_DEPTH: 32
 
 
 # Gwei values
@@ -46,8 +42,6 @@ EFFECTIVE_BALANCE_INCREMENT: 1000000000
 GENESIS_FORK_VERSION: 0x00000000
 # 0, GENESIS_EPOCH is derived from this constant
 GENESIS_SLOT: 0
-# 2**64 - 1
-FAR_FUTURE_EPOCH: 18446744073709551615
 BLS_WITHDRAWAL_PREFIX: 0
 
 
@@ -80,11 +74,11 @@ MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
 # State list lengths
 # ---------------------------------------------------------------
 # 2**13 (= 8,192) epochs ~36 days
-LATEST_RANDAO_MIXES_LENGTH: 8192
+RANDAO_MIXES_LENGTH: 8192
 # 2**13 (= 8,192) epochs ~36 days
-LATEST_ACTIVE_INDEX_ROOTS_LENGTH: 8192
+ACTIVE_INDEX_ROOTS_LENGTH: 8192
 # 2**13 (= 8,192) epochs ~36 days
-LATEST_SLASHED_EXIT_LENGTH: 8192
+SLASHED_EXIT_LENGTH: 8192
 
 
 # Reward and penalty quotients

diff --git a/configs/constant_presets/minimal.yaml b/configs/constant_presets/minimal.yaml
@@ -14,8 +14,6 @@ MAX_INDICES_PER_ATTESTATION: 4096
 MIN_PER_EPOCH_CHURN_LIMIT: 4
 # 2**16 (= 65,536)
 CHURN_LIMIT_QUOTIENT: 65536
-# Normalizes base rewards
-BASE_REWARDS_PER_EPOCH: 5
 # [customized] Faster, but unsecure.
 SHUFFLE_ROUND_COUNT: 10
 
@@ -24,8 +22,6 @@ SHUFFLE_ROUND_COUNT: 10
 # ---------------------------------------------------------------
 # **TBD**
 DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
-# 2**5 (= 32)
-DEPOSIT_CONTRACT_TREE_DEPTH: 32
 
 
 # Gwei values
@@ -45,8 +41,6 @@ EFFECTIVE_BALANCE_INCREMENT: 1000000000
 GENESIS_FORK_VERSION: 0x00000000
 # 0, GENESIS_EPOCH is derived from this constant
 GENESIS_SLOT: 0
-# 2**64 - 1
-FAR_FUTURE_EPOCH: 18446744073709551615
 BLS_WITHDRAWAL_PREFIX: 0
 
 
@@ -81,11 +75,11 @@ EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 4096
 # State list lengths
 # ---------------------------------------------------------------
 # [customized] smaller state
-LATEST_RANDAO_MIXES_LENGTH: 64
+RANDAO_MIXES_LENGTH: 64
 # [customized] smaller state
-LATEST_ACTIVE_INDEX_ROOTS_LENGTH: 64
+ACTIVE_INDEX_ROOTS_LENGTH: 64
 # [customized] smaller state
-LATEST_SLASHED_EXIT_LENGTH: 64
+SLASHED_EXIT_LENGTH: 64
 
 
 # Reward and penalty quotients

diff --git a/scripts/build_spec.py b/scripts/build_spec.py
@@ -144,9 +144,10 @@ def objects_to_spec(functions: Dict[str, str],
     """
     Given all the objects that constitute a spec, combine them into a single pyfile.
     """
-    new_type_definitions = \
-        '\n'.join(['''%s = NewType('%s', %s)''' % (key, key, value) for key, value in new_types.items()])
-    new_type_definitions += '\n' + '\n'.join(['Bytes%s = BytesN[%s]' % (n, n) for n in byte_types])
+    new_type_definitions = '\n'.join(['Bytes%s = BytesN[%s]' % (n, n) for n in byte_types])
+    new_type_definitions += '\n' + '\n'.join(['Hash = Bytes32', 'BLSPubkey = Bytes48', 'BLSSignature = Bytes96'])
+    new_type_definitions += \
+        '\n' + '\n'.join(['''%s = NewType('%s', %s)''' % (key, key, value) for key, value in new_types.items()])
     functions_spec = '\n\n'.join(functions.values())
     constants_spec = '\n'.join(map(lambda x: '%s = %s' % (x, constants[x]), constants))
     ssz_objects_instantiation_spec = '\n\n'.join(ssz_objects.values())
@@ -191,7 +192,7 @@ def dependency_order_ssz_objects(objects: Dict[str, str]) -> None:
     items = list(objects.items())
     for key, value in items:
         dependencies = re.findall(r'(: [A-Z][\w[]*)', value)
-        dependencies = map(lambda x: re.sub(r'\W|Vector|List|Container|Dict|uint\d+|Bytes\d+|bytes', '', x), dependencies)
+        dependencies = map(lambda x: re.sub(r'\W|Vector|List|Container|Hash|BLSPubkey|BLSSignature|uint\d+|Bytes\d+|bytes', '', x), dependencies)
         for dep in dependencies:
             if dep in NEW_TYPES or len(dep) == 0:
                 continue