Tests are executable! :)

Author: adiasg

Makefile

@@ -28,4 +28,4 @@ venv_lint: venv_activate
 	$(VENV_ACTIVATE) && flake8 --config=flake8.ini ./src ./tests && mypy --config-file mypy.ini ./src ./tests
 
 venv_test: venv_activate
-	@echo "TODO: implement tests"
+	$(VENV_ACTIVATE) && ${VENV_NAME}/bin/python -m pytest tests/test.py

requirements.txt

@@ -4,3 +4,6 @@ eth2spec==1.1.2
 # dev requirements
 mypy
 flake8
+
+# test requirements
+pytest

src/dvspec/consensus.py

@@ -24,7 +24,7 @@ def consensus_is_valid_attestation_data(slashing_db: SlashingDB,
     """Determines if the given attestation is valid for the attestation duty.
     """
     assert attestation_data.slot == attestation_duty.slot
-    assert attestation_data.committee_index == attestation_duty.committee_index
+    assert attestation_data.index == attestation_duty.committee_index
     assert not is_slashable_attestation_data(slashing_db, attestation_data, attestation_duty.pubkey)
     return True
 
@@ -36,6 +36,7 @@ def consensus_on_attestation(slashing_db: SlashingDB, attestation_duty: Attestat
     The consensus protocol must use `consensus_is_valid_attestation_data` to determine
     validity of the proposed attestation value.
     """
+    print("This is the wrong consensus_on_attestation")
     pass
 
 

tests/helpers/consensus.py

@@ -33,6 +33,7 @@ def consensus_on_attestation(slashing_db: SlashingDB, attestation_duty: Attestat
     validity of the proposed attestation value.
     """
     # TODO: Use this method in tests instead of dvspec.consensus.consensus_on_attestation
+    print("This is the correct consensus_on_attestation")
     attestation_data = bn_produce_attestation_data(attestation_duty.slot, attestation_duty.committee_index)
     assert consensus_is_valid_attestation_data(slashing_db, attestation_data, attestation_duty)
     return attestation_data
@@ -46,6 +47,6 @@ def consensus_on_block(slashing_db: SlashingDB, proposer_duty: ProposerDuty) ->
     validity of the proposed block value.
     """
     # TODO: Use this method in tests instead of dvspec.consensus.consensus_on_block
-    block = bn_produce_block(proposer_duty.slot, BLSSignature(0x00), Bytes32(0x00))
+    block = bn_produce_block(proposer_duty.slot, BLSSignature(b'0'*96), Bytes32(b'0'*32))
     assert consensus_is_valid_block(slashing_db, block, proposer_duty)
     return block

tests/helpers/eth_node_interface.py

@@ -94,10 +94,13 @@ def fill_attestation_duties_with_val_index(state: State,
     return attestation_duties
 
 
-def fill_proposer_duties_with_val_index(state: State, proposer_duties: List[ProposerDuty]) -> List[ProposerDuty]:
+def filter_and_fill_proposer_duties_with_val_index(state: State, proposer_duties: List[ProposerDuty]) -> List[ProposerDuty]:
+    filtered_proposer_duties = []
     val_index_to_pubkey = {}
     for dv in state.distributed_validators:
         val_index_to_pubkey[dv.validator_identity.index] = dv.validator_identity.pubkey
     for pro_duty in proposer_duties:
-        pro_duty.pubkey = val_index_to_pubkey[pro_duty.validator_index]
-    return proposer_duties
+        if pro_duty.validator_index in val_index_to_pubkey:
+            pro_duty.pubkey = val_index_to_pubkey[pro_duty.validator_index]
+            filtered_proposer_duties.append(pro_duty)
+    return filtered_proposer_duties

tests/helpers/state.py

@@ -21,7 +21,7 @@
 def build_distributed_validator(validator_identity: ValidatorIdentity,
                                 num_covalidators: int = 4) -> DistributedValidator:
     co_validators = []
-    for i in range(1, num_covalidators):
+    for i in range(num_covalidators):
         co_validators.append(CoValidator(validator_identity=validator_identity, pubkey=BLSPubkey(0x00), index=i))
     slashing_db = SlashingDB(interchange_format_version=5,
                              genesis_validators_root=Root(),

tests/test.py

@@ -1,5 +1,12 @@
+from pkgutil import iter_modules
+import importlib
+
+from eth2spec.phase0.mainnet import SLOTS_PER_EPOCH
+
+import dvspec
 from dvspec.spec import (
     serve_attestation_duty,
+    serve_proposer_duty,
 )
 
 from helpers.time import (
@@ -11,11 +18,37 @@
     get_validator_indices,
     get_distributed_validator_by_index,
 )
+from tests.helpers.consensus import (
+    consensus_on_attestation,
+    consensus_on_block,
+)
 from tests.helpers.eth_node_interface import (
+    SLOTS_PER_EPOCH,
     bn_get_attestation_duties_for_epoch,
+    bn_produce_attestation_data,
+    bn_submit_attestation,
+    bn_get_proposer_duties_for_epoch,
+    bn_produce_block,
     fill_attestation_duties_with_val_index,
+    filter_and_fill_proposer_duties_with_val_index,
 )
 
+# Replace unimplemented methods from dvspec by methods from the test module
+def replace_module_method(module, method_name_string, replacement_method) -> None:
+    try:
+        getattr(module, method_name_string)
+        setattr(module, method_name_string, replacement_method)
+    except AttributeError:
+        pass
+
+def replace_method_in_dvspec(method_name_string, replacement_method) -> None:
+    for dvspec_submodule_info in iter_modules(dvspec.__path__):
+        dvspec_submodule = importlib.import_module(dvspec.__name__ + '.' + dvspec_submodule_info.name)
+        replace_module_method(dvspec_submodule, method_name_string, replacement_method)
+
+replace_method_in_dvspec("consensus_on_attestation", consensus_on_attestation)
+replace_method_in_dvspec("consensus_on_block", consensus_on_block)
+
 
 def test_basic_attestation() -> None:
     state = build_state(5)
@@ -29,7 +62,21 @@ def test_basic_attestation() -> None:
 
     distributed_validator = get_distributed_validator_by_index(state, attestation_duty.validator_index)
     slashing_db = distributed_validator.slashing_db
-
-    # TODO: Need to replace dvspec.consensus.consensus_on_attestation with
-    # tests.helpers.consensus.consensus_on_attestation
     serve_attestation_duty(slashing_db, attestation_duty)
+
+
+def test_basic_block() -> None:
+    state = build_state(5)
+    time = get_current_time()
+
+    current_epoch = compute_epoch_at_time(time)
+    validator_indices = get_validator_indices(state)
+    proposer_duties = bn_get_proposer_duties_for_epoch(current_epoch+1)
+    filled_proposer_duties = filter_and_fill_proposer_duties_with_val_index(state, proposer_duties)
+    while len(filled_proposer_duties) == 0:
+        proposer_duties = bn_get_proposer_duties_for_epoch(current_epoch+1)
+        filled_proposer_duties = filter_and_fill_proposer_duties_with_val_index(state, proposer_duties)
+    proposer_duty = filled_proposer_duties[0]
+    distributed_validator = get_distributed_validator_by_index(state, proposer_duty.validator_index)
+    slashing_db = distributed_validator.slashing_db
+    serve_proposer_duty(slashing_db, proposer_duty)