Clean up

Author: hwwhww

eth/beacon/helpers.py

@@ -138,25 +138,6 @@ def get_hashes_to_sign(latest_block_hashes: Sequence[Hash32],
     yield block.hash
 
 
-@to_tuple
-def get_signed_parent_hashes(latest_block_hashes: Sequence[Hash32],
-                             block: 'BaseBeaconBlock',
-                             attestation: 'AttestationRecord',
-                             epoch_length: int) -> Iterable[Hash32]:
-    """
-    Given an attestation and the block they were included in,
-    the list of hashes that were included in the signature.
-    """
-    yield from get_hashes_from_latest_block_hashes(
-        latest_block_hashes,
-        block.slot,
-        from_slot=attestation.slot - epoch_length + 1,
-        to_slot=attestation.slot - len(attestation.oblique_parent_hashes),
-        epoch_length=epoch_length,
-    )
-    yield from attestation.oblique_parent_hashes
-
-
 @to_tuple
 def get_new_latest_block_hashes(old_block_hashes: Sequence[Hash32],
                                 parent_slot: int,
@@ -199,7 +180,7 @@ def get_shard_committees_at_slot(state: 'BeaconState',
                                  slot: int,
                                  epoch_length: int) -> Tuple[ShardCommittee]:
     """
-    Returns the ``ShardCommittee`` for the ``slot``.
+    Return the ``ShardCommittee`` for the ``slot``.
     """
     return _get_shard_committees_at_slot(
         latest_state_recalculation_slot=state.latest_state_recalculation_slot,
@@ -209,30 +190,9 @@ def get_shard_committees_at_slot(state: 'BeaconState',
     )
 
 
-@to_tuple
-def get_attestation_indices(crystallized_state: 'CrystallizedState',
-                            attestation: 'AttestationRecord',
-                            epoch_length: int) -> Iterable[int]:
-    """
-    FIXME
-    Return committee of the given attestation.
-    """
-    shard_id = attestation.shard_id
-
-    shards_committees_for_slot = get_shard_committees_at_slot(
-        crystallized_state,
-        attestation.slot,
-        epoch_length,
-    )
-
-    for shard_committee in shards_committees_for_slot:
-        if shard_committee.shard_id == shard_id:
-            yield from shard_committee.committee
-
-
 def get_active_validator_indices(validators: Sequence['ValidatorRecord']) -> Tuple[int, ...]:
     """
-    Gets indices of active validators from ``validators``.
+    Get indices of active validators from ``validators``.
     """
     return tuple(
         i for i, v in enumerate(validators)
@@ -250,7 +210,7 @@ def _get_shards_committees_for_shard_indices(
         total_validator_count: int,
         shard_count: int) -> Iterable[ShardCommittee]:
     """
-    Returns filled [ShardCommittee] tuple.
+    Return filled [ShardCommittee] tuple.
     """
     for index, indices in enumerate(shard_indices):
         yield ShardCommittee(
@@ -383,7 +343,7 @@ def get_beacon_proposer_index(state: 'BeaconState',
                               slot: int,
                               epoch_length: int) -> int:
     """
-    Returns the beacon proposer index for the ``slot``.
+    Return the beacon proposer index for the ``slot``.
     """
     shard_committees = get_shard_committees_at_slot(
         state,
@@ -408,14 +368,6 @@ def get_beacon_proposer_index(state: 'BeaconState',
 #
 # Bitfields
 #
-@to_tuple
-def _get_shard_committees(shard_committees: Sequence[ShardCommittee],
-                          shard: int) -> Iterable[ShardCommittee]:
-    for item in shard_committees:
-        if item.shard == shard:
-            yield item
-
-
 @to_tuple
 def get_attestation_participants(state: 'BeaconState',
                                  slot: int,
@@ -427,14 +379,21 @@ def get_attestation_participants(state: 'BeaconState',
     from ``participation_bitfield``.
     """
     # Find the relevant committee
-    shard_committees = _get_shard_committees(
-        shard_committees=get_shard_committees_at_slot(
-            state,
-            slot,
-            epoch_length,
-        ),
-        shard=shard,
+    # Filter by slot
+    shard_committees_at_slot = get_shard_committees_at_slot(
+        state,
+        slot,
+        epoch_length,
+    )
+    # Filter by shard
+    shard_committees = tuple(
+        [
+            shard_committee
+            for shard_committee in shard_committees_at_slot
+            if shard_committee.shard == shard
+        ]
     )
+
     try:
         shard_committee = shard_committees[0]
     except IndexError:

tests/beacon/test_helpers.py

@@ -3,7 +3,6 @@
 from eth.beacon.enums.validator_status_codes import (
     ValidatorStatusCode,
 )
-from eth.beacon.types.attestation_records import AttestationRecord
 from eth.beacon.types.blocks import BaseBeaconBlock
 from eth.beacon.types.shard_committees import ShardCommittee
 from eth.beacon.types.states import BeaconState
@@ -12,14 +11,12 @@
     _get_element_from_recent_list,
     get_active_validator_indices,
     get_attestation_participants,
-    get_attestation_indices,
     get_beacon_proposer_index,
     get_block_hash,
     get_hashes_from_latest_block_hashes,
     get_hashes_to_sign,
     get_new_shuffling,
     _get_shard_committees_at_slot,
-    get_signed_parent_hashes,
     get_block_committees_info,
 )
 
@@ -145,7 +142,6 @@ def test_get_block_hash(
             )
 
 
-@pytest.mark.xfail(reason="Need to be fixed")
 @pytest.mark.parametrize(
     (
         'epoch_length,current_block_slot,from_slot,to_slot'
@@ -156,13 +152,13 @@ def test_get_block_hash(
     ],
 )
 def test_get_hashes_from_latest_block_hashes(
-        genesis_block,
+        sample_block,
         current_block_slot,
         from_slot,
         to_slot,
         epoch_length):
     _, latest_block_hashes = generate_mock_latest_block_hashes(
-        genesis_block,
+        sample_block,
         current_block_slot,
         epoch_length,
     )
@@ -177,12 +173,11 @@ def test_get_hashes_from_latest_block_hashes(
     assert len(result) == to_slot - from_slot + 1
 
 
-@pytest.mark.xfail(reason="Need to be fixed")
-def test_get_hashes_to_sign(genesis_block, epoch_length):
+def test_get_hashes_to_sign(sample_block, epoch_length):
     epoch_length = epoch_length
     current_block_slot = 1
     blocks, latest_block_hashes = generate_mock_latest_block_hashes(
-        genesis_block,
+        sample_block,
         current_block_slot,
         epoch_length,
     )
@@ -197,34 +192,6 @@ def test_get_hashes_to_sign(genesis_block, epoch_length):
     assert result[-1] == block.hash
 
 
-@pytest.mark.xfail(reason="Need to be fixed")
-def test_get_new_latest_block_hashes(genesis_block,
-                                     epoch_length,
-                                     sample_attestation_record_params):
-    epoch_length = epoch_length
-    current_block_slot = 15
-    blocks, latest_block_hashes = generate_mock_latest_block_hashes(
-        genesis_block,
-        current_block_slot,
-        epoch_length,
-    )
-
-    block = blocks[current_block_slot]
-    oblique_parent_hashes = [b'\x77' * 32]
-    attestation = AttestationRecord(**sample_attestation_record_params).copy(
-        slot=10,
-        oblique_parent_hashes=oblique_parent_hashes,
-    )
-    result = get_signed_parent_hashes(
-        latest_block_hashes,
-        block,
-        attestation,
-        epoch_length,
-    )
-    assert len(result) == epoch_length
-    assert result[-1] == oblique_parent_hashes[-1]
-
-
 #
 # Get shards_committees or indices
 #
@@ -325,34 +292,6 @@ def test_get_shard_committee_for_slot(
             )
 
 
-@pytest.mark.xfail(reason="Need to be fixed")
-# @pytest.mark.parametrize(
-#     (
-#         'num_validators,'
-#         'epoch_length,min_committee_size'
-#     ),
-#     [
-#         (1000, 20, 10),
-#     ],
-# )
-def test_get_attestation_indices(genesis_crystallized_state,
-                                 sample_attestation_record_params,
-                                 epoch_length,
-                                 min_committee_size):
-    attestation = AttestationRecord(**sample_attestation_record_params)
-    attestation = attestation.copy(
-        slot=0,
-        shard_id=0,
-    )
-
-    attestation_indices = get_attestation_indices(
-        genesis_crystallized_state,
-        attestation,
-        epoch_length,
-    )
-    assert len(attestation_indices) >= min_committee_size
-
-
 #
 # Shuffling
 #