Implement tests.helpers.consensus.consensus_on_block, fix lint errors

Author: adiasg

src/dvspec/spec.py

@@ -115,7 +115,7 @@ def serve_attestation_duty(slashing_db: SlashingDB, attestation_duty: Attestatio
     attestation_data = consensus_on_attestation(slashing_db, attestation_duty)
     # Release lock on consensus_on_attestation here.
     # Add attestation to slashing DB
-    update_attestation_slashing_db(slashing_db, attestation_data, attestation_duty)
+    update_attestation_slashing_db(slashing_db, attestation_data, attestation_duty.pubkey)
     # Cache decided attestation data value to provide to VC
     cache_attestation_data_for_vc(attestation_data, attestation_duty)
 
@@ -137,7 +137,7 @@ def serve_proposer_duty(slashing_db: SlashingDB, proposer_duty: ProposerDuty) ->
     block = consensus_on_block(slashing_db, proposer_duty)
     # Release lock on consensus_on_block here.
     # Add block to slashing DB
-    update_block_slashing_db(slashing_db, block, proposer_duty)
+    update_block_slashing_db(slashing_db, block, proposer_duty.pubkey)
     # Cache decided block value to provide to VC
     cache_block_for_vc(block, proposer_duty)
 

tests/helpers/consensus.py

@@ -3,21 +3,20 @@
     BeaconBlock,
 )
 from dvspec.utils.types import (
+    BLSSignature,
+    Bytes32,
     AttestationDuty,
     ProposerDuty,
     SlashingDB,
 )
-from dvspec.utils.helpers import (
-    is_slashable_attestation_data,
-    is_slashable_block,
-)
 from dvspec.consensus import (
     consensus_is_valid_attestation_data,
     consensus_is_valid_block,
 )
 
 from tests.helpers.eth_node_interface import (
     bn_produce_attestation_data,
+    bn_produce_block,
 )
 
 
@@ -35,16 +34,18 @@ def consensus_on_attestation(slashing_db: SlashingDB, attestation_duty: Attestat
     """
     # TODO: Use this method in tests instead of dvspec.consensus.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)
+    assert consensus_is_valid_attestation_data(slashing_db, attestation_data, attestation_duty)
     return attestation_data
 
 
-def consensus_on_block(slashing_db: SlashingDB, proposer_duty: ProposerDuty) -> AttestationData:
+def consensus_on_block(slashing_db: SlashingDB, proposer_duty: ProposerDuty) -> BeaconBlock:
     """Consensus protocol between distributed validator nodes for block values.
     Returns the decided value.
     If this DV is the leader, it must use `bn_produce_block` for the proposed value.
     The consensus protocol must use `consensus_is_valid_block` to determine
     validity of the proposed block value.
     """
-    # TODO: Implement & use this method in tests instead of dvspec.consensus.consensus_on_block
-    pass
+    # TODO: Use this method in tests instead of dvspec.consensus.consensus_on_block
+    block = bn_produce_block(proposer_duty.slot, BLSSignature(0x00), Bytes32(0x00))
+    assert consensus_is_valid_block(slashing_db, block, proposer_duty)
+    return block

tests/helpers/state.py

@@ -18,7 +18,8 @@
 """
 
 
-def build_distributed_validator(validator_identity: ValidatorIdentity, num_covalidators=4) -> DistributedValidator:
+def build_distributed_validator(validator_identity: ValidatorIdentity,
+                                num_covalidators: int = 4) -> DistributedValidator:
     co_validators = []
     for i in range(1, num_covalidators):
         co_validators.append(CoValidator(validator_identity=validator_identity, pubkey=BLSPubkey(0x00), index=i))
@@ -31,7 +32,7 @@ def build_distributed_validator(validator_identity: ValidatorIdentity, num_coval
     return distributed_validator
 
 
-def build_state(num_distributed_validators) -> State:
+def build_state(num_distributed_validators: int) -> State:
     distributed_validators = []
     for i in range(num_distributed_validators):
         validator_identity = ValidatorIdentity(pubkey=BLSPubkey(i), index=i)

tests/test.py

@@ -17,7 +17,7 @@
 )
 
 
-def test_basic_attestation():
+def test_basic_attestation() -> None:
     state = build_state(5)
     time = get_current_time()