cleanup some bugs in attestation testing.

Author: djrtwo

eth/beacon/helpers.py

@@ -84,7 +84,8 @@ def get_block_root(
     """
     Returns the block root at a recent ``slot``.
     """
-    slot_relative_position = max(current_slot - len(latest_block_roots), 0)
+    slot_relative_position = current_slot - len(latest_block_roots)
+    # slot_relative_position = max(current_slot - len(latest_block_roots), 0)
     return _get_element_from_recent_list(
         latest_block_roots,
         slot,
@@ -109,7 +110,7 @@ def _get_shard_committees_at_slot(
             )
         )
 
-    slot_relative_position = max(state_slot - epoch_length, 0)
+    slot_relative_position = state_slot - epoch_length
 
     yield from _get_element_from_recent_list(
         shard_committees_at_slots,

eth/beacon/state_machines/forks/serenity/state_transitions.py

@@ -1,3 +1,7 @@
+from eth_typing import (
+    Hash32,
+)
+
 from eth.beacon.types.blocks import BaseBeaconBlock
 from eth.beacon.types.states import BeaconState
 
@@ -16,14 +20,22 @@ def __init__(self, config: BeaconConfig):
         self.config = config
 
     def apply_state_transition(self, state: BeaconState, block: BaseBeaconBlock) -> BeaconState:
-        state = self.per_slot_transition(state, block)
-        state = self.per_block_transition(state, block)
-        state = self.per_epoch_transition(state, block)
+        while state.slot != block.slot:
+            state = self.per_slot_transition(state, block.parent_root)
+            if state.slot == block.slot:
+                state = self.per_block_transition(state, block)
+            if state.slot % self.config.EPOCH_LENGTH == 0:
+                state = self.per_epoch_transition(state)
 
         return state
 
-    def per_slot_transition(self, state: BeaconState, block: BaseBeaconBlock) -> BeaconState:
+    def per_slot_transition(self,
+                            state: BeaconState,
+                            previous_block_root: Hash32) -> BeaconState:
         # TODO
+        state = state.copy(
+            slot=state.slot + 1
+        )
         return state
 
     def per_block_transition(self, state: BeaconState, block: BaseBeaconBlock) -> BeaconState:

eth/beacon/state_machines/forks/serenity/validation.py

@@ -168,10 +168,10 @@ def validate_serenity_attestation_latest_crosslink_root(attestation_data: Attest
     field of ``attestation_data`` is the provided ``latest_crosslink_root``.
     Raise ``ValidationError`` if it's invalid.
     """
-    acceptable_shard_block_roots = [
+    acceptable_shard_block_roots = {
         attestation_data.latest_crosslink_root,
         attestation_data.shard_block_root,
-    ]
+    }
     if latest_crosslink_root not in acceptable_shard_block_roots:
         raise ValidationError(
             "Neither the attestation ``latest_crosslink_root`` nor the attestation "
@@ -229,6 +229,8 @@ def validate_serenity_attestation_aggregate_signature(state: Type[BeaconState],
     )
     group_public_key = bls.aggregate_pubkeys(pubkeys)
 
+    # TODO: change to tree hashing when we have SSZ
+    # TODO: Replace with AttestationAndCustodyBit data structure
     message = hash_eth2(
         rlp.encode(attestation.data) +
         (0).to_bytes(1, "big")

eth/beacon/state_machines/state_transitions.py

@@ -3,11 +3,13 @@
     abstractmethod,
 )
 
+from eth_typing import (
+    Hash32,
+)
 from eth._utils.datatypes import (
     Configurable,
 )
 
-from eth.beacon.types.attestations import Attestation
 from eth.beacon.types.blocks import BaseBeaconBlock
 from eth.beacon.types.states import BeaconState
 
@@ -25,22 +27,15 @@ def apply_state_transition(self, state: BeaconState, block: BaseBeaconBlock) ->
         pass
 
     @abstractmethod
-    def per_slot_transition(self, state: BeaconState, block: BaseBeaconBlock) -> BeaconState:
+    def per_slot_transition(self,
+                            state: BeaconState,
+                            previous_block_root: Hash32) -> BeaconState:
         pass
 
     @abstractmethod
     def per_block_transition(self, state: BeaconState, block: BaseBeaconBlock) -> BeaconState:
         pass
 
     @abstractmethod
-    def per_epoch_transition(self, state: BeaconState, block: BaseBeaconBlock) -> BeaconState:
+    def per_epoch_transition(self, state: BeaconState) -> BeaconState:
         pass
-
-    #
-    # Operation validations
-    #
-    @abstractmethod
-    def validate_attestation(self,
-                             attestation: Attestation,
-                             is_validating_signatures: bool=True) -> None:
-        raise NotImplementedError

tests/beacon/conftest.py

@@ -599,4 +599,3 @@ def create_mock_signed_attestation(state,
         )
 
     return create_mock_signed_attestation
-

tests/beacon/state_machines/test_attestation_validation.py

@@ -244,7 +244,6 @@ def test_validate_serenity_attestation_aggregate_signature(genesis_state,
                                                            random,
                                                            sample_attestation_data_params,
                                                            create_mock_signed_attestation,
-                                                           config,
                                                            is_valid):
     state = genesis_state
 

tests/beacon/state_machines/test_demo.py

@@ -5,11 +5,13 @@
 
 def test_demo(base_db, sample_beacon_block_params, sample_beacon_state_params, fixture_sm_class):
     chaindb = BeaconChainDB(base_db)
-    block = BaseBeaconBlock(**sample_beacon_block_params)
     state = BeaconState(**sample_beacon_state_params)
+    block = BaseBeaconBlock(**sample_beacon_block_params).copy(
+        slot=state.slot + 2,
+    )
 
     sm = fixture_sm_class(chaindb, block, state)
     result_state, result_block = sm.import_block(block)
 
     assert state.slot == 0
-    assert result_state.slot == sm.config.ZERO_BALANCE_VALIDATOR_TTL
+    assert result_state.slot == block.slot

tests/beacon/state_machines/test_serenity_operations.py

@@ -10,6 +10,7 @@
 
 from eth.beacon.helpers import (
     get_block_root,
+    get_shard_committees_at_slot,
 )
 
 from eth.beacon.types.attestation_data import AttestationData
@@ -20,6 +21,49 @@
 )
 
 
+@pytest.fixture
+def create_mock_signed_attestations_at_slot(config,
+                                            sample_attestation_data_params,
+                                            create_mock_signed_attestation):
+    def create_mock_signed_attestations_at_slot(state,
+                                                attestation_slot):
+        attestations = []
+        shard_and_committees_at_slot = get_shard_committees_at_slot(
+            state,
+            slot=attestation_slot,
+            epoch_length=config.EPOCH_LENGTH,
+        )
+        for shard_committee in shard_and_committees_at_slot:
+            # have 0th committee member sign
+            voting_committee_indices = [0]
+            latest_crosslink_root = state.latest_crosslinks[shard_committee.shard].shard_block_root
+
+            assert len(shard_committee.committee) > 0
+            attestation_data = AttestationData(**sample_attestation_data_params).copy(
+                slot=attestation_slot,
+                shard=shard_committee.shard,
+                justified_slot=state.previous_justified_slot,
+                justified_block_root=get_block_root(
+                    state.latest_block_roots,
+                    state.slot,
+                    state.previous_justified_slot,
+                ),
+                latest_crosslink_root=latest_crosslink_root,
+                shard_block_root=ZERO_HASH32,
+            )
+
+            attestations.append(
+                create_mock_signed_attestation(
+                    state,
+                    shard_committee,
+                    voting_committee_indices,
+                    attestation_data,
+                )
+            )
+        return tuple(attestations)
+    return create_mock_signed_attestations_at_slot
+
+
 @pytest.mark.parametrize(
     (
         'num_validators,'
@@ -40,7 +84,7 @@ def test_process_attestations(genesis_state,
                               sample_beacon_block_params,
                               sample_beacon_block_body_params,
                               config,
-                              create_mock_signed_attestation,
+                              create_mock_signed_attestations_at_slot,
                               success):
 
     attestation_slot = 0
@@ -49,71 +93,43 @@ def test_process_attestations(genesis_state,
         slot=current_slot,
     )
 
-    attestations = []
-    for shard_committee in state.shard_committees_at_slots[attestation_slot]:
-        # have 0th committee member sign
-        voting_committee_indices = [0]
-        latest_crosslink_root = state.latest_crosslinks[shard_committee.shard].shard_block_root
-
-        assert len(shard_committee.committee) > 0
-        attestation_data = AttestationData(**sample_attestation_data_params).copy(
-            slot=attestation_slot,
-            shard=shard_committee.shard,
-            justified_slot=state.previous_justified_slot,
-            justified_block_root=get_block_root(
-                state.latest_block_roots,
-                state.slot,
-                state.previous_justified_slot,
-            ),
-            latest_crosslink_root=latest_crosslink_root,
-            shard_block_root=ZERO_HASH32,
-        )
-
-        attestations.append(
-            create_mock_signed_attestation(
-                state,
-                shard_committee,
-                voting_committee_indices,
-                attestation_data,
-            )
-        )
+    attestations = create_mock_signed_attestations_at_slot(
+        state,
+        attestation_slot,
+    )
 
     assert len(attestations) > 0
 
     if not success:
         # create invalid attestation in the future
-        bad_attestation_data = AttestationData(**sample_attestation_data_params).copy(
+        invalid_attestation_data = attestations[-1].data.copy(
             slot=state.slot + 10,
         )
-        attestations.append(
-            create_mock_signed_attestation(
-                state,
-                state.shard_committees_at_slots[attestation_slot][0],
-                [0],
-                bad_attestation_data,
-            )
+        invalid_attestation = attestations[-1].copy(
+            data=invalid_attestation_data,
         )
+        attestations = attestations[:-1] + (invalid_attestation,)
 
     block_body = BeaconBlockBody(**sample_beacon_block_body_params).copy(
         attestations=attestations,
     )
     block = BaseBeaconBlock(**sample_beacon_block_params).copy(
         slot=current_slot,
-        body=block_body
+        body=block_body,
     )
 
     if success:
         new_state = process_attestations(
             state,
             block,
-            config
+            config,
         )
 
         assert len(new_state.latest_attestations) == len(attestations)
     else:
         with pytest.raises(ValidationError):
-            new_state = process_attestations(
+            process_attestations(
                 state,
                 block,
-                config
+                config,
             )

tests/beacon/test_helpers.py

@@ -131,12 +131,11 @@ def test_get_element_from_recent_list(target_list,
         (128, 128, False),
     ],
 )
-def test_get_block_root(
-        current_block_number,
-        target_slot,
-        success,
-        epoch_length,
-        sample_block):
+def test_get_block_root(current_block_number,
+                        target_slot,
+                        success,
+                        epoch_length,
+                        sample_block):
     blocks, latest_block_roots = generate_mock_latest_block_roots(
         sample_block,
         current_block_number,