Clean up

Author: hwwhww

eth/beacon/block_committees_info.py

@@ -12,8 +12,7 @@
     'BlockCommitteesInfo',
     (
         ('proposer_index', int),
-        ('proposer_index_in_committee', int),
-        ('proposer_shard_id', int),
+        ('proposer_shard', int),
         ('proposer_committee_size', int),
         ('shards_committees', Tuple['ShardCommittee'])
     )

eth/beacon/helpers.py

@@ -43,10 +43,8 @@
 
 
 if TYPE_CHECKING:
-    from eth.beacon.types.active_states import ActiveState  # noqa: F401
     from eth.beacon.types.attestation_records import AttestationRecord  # noqa: F401
     from eth.beacon.types.blocks import BaseBeaconBlock  # noqa: F401
-    from eth.beacon.types.crystallized_states import CrystallizedState  # noqa: F401
     from eth.beacon.types.states import BeaconState  # noqa: F401
     from eth.beacon.types.validator_records import ValidatorRecord  # noqa: F401
 
@@ -309,7 +307,6 @@ def get_block_committees_info(parent_block: 'BaseBeaconBlock',
         epoch_length,
     )
     """
-    FIXME
     Return the block committees and proposer info with BlockCommitteesInfo pack.
     """
     # `proposer_index_in_committee` th attester in `shard_committee`
@@ -330,13 +327,11 @@ def get_block_committees_info(parent_block: 'BaseBeaconBlock',
         proposer_committee_size
     )
 
-    # The index in CrystallizedState.validators
     proposer_index = shard_committee.committee[proposer_index_in_committee]
 
     return BlockCommitteesInfo(
         proposer_index=proposer_index,
-        proposer_index_in_committee=proposer_index_in_committee,
-        proposer_shard_id=shard_committee.shard_id,
+        proposer_shard=shard_committee.shard,
         proposer_committee_size=proposer_committee_size,
         shards_committees=shards_committees,
     )

tests/beacon/test_helpers.py

@@ -376,61 +376,65 @@ def test_get_new_shuffling_handles_shard_wrap(genesis_validators,
 #
 # Get proposer postition
 #
-@pytest.mark.xfail(reason="Need to be fixed")
 @pytest.mark.parametrize(
     (
-        'committee,parent_block_number,result_proposer_index_in_committee'
+        'num_validators,committee,parent_block_number,result_proposer_index'
     ),
     [
-        ([0, 1, 2, 3], 0, 0),
-        ([0, 1, 2, 3], 2, 2),
-        ([0, 1, 2, 3], 11, 3),
-        ([], 1, ValueError()),
+        (100, [4, 5, 6, 7], 0, 4),
+        (100, [4, 5, 6, 7], 2, 6),
+        (100, [4, 5, 6, 7], 11, 7),
+        (100, [], 1, ValueError()),
     ],
 )
 def test_get_block_committees_info(monkeypatch,
-                                   genesis_block,
-                                   genesis_crystallized_state,
+                                   sample_block,
+                                   sample_state,
+                                   num_validators,
                                    committee,
                                    parent_block_number,
-                                   result_proposer_index_in_committee,
+                                   result_proposer_index,
                                    epoch_length):
     from eth.beacon import helpers
 
-    def mock_get_shard_committees_at_slot(parent_block,
-                                          crystallized_state,
+    def mock_get_shard_committees_at_slot(state,
+                                          slot,
                                           epoch_length):
-        return [
-            ShardCommittee(shard_id=1, committee=committee),
-        ]
+        return (
+            ShardCommittee(
+                shard=1,
+                committee=committee,
+                total_validator_count=num_validators,
+            ),
+        )
 
     monkeypatch.setattr(
         helpers,
-        '_get_shard_committees_at_slot',
+        'get_shard_committees_at_slot',
         mock_get_shard_committees_at_slot
     )
 
-    parent_block = genesis_block
-    parent_block = genesis_block.copy(
+    parent_block = sample_block
+    parent_block = sample_block.copy(
         slot=parent_block_number,
     )
 
-    if isinstance(result_proposer_index_in_committee, Exception):
+    if isinstance(result_proposer_index, Exception):
         with pytest.raises(ValueError):
             get_block_committees_info(
                 parent_block,
-                genesis_crystallized_state,
+                sample_state,
                 epoch_length,
             )
     else:
         block_committees_info = get_block_committees_info(
             parent_block,
-            genesis_crystallized_state,
+            sample_state,
             epoch_length,
         )
         assert (
-            block_committees_info.proposer_index_in_committee ==
-            result_proposer_index_in_committee
+            block_committees_info.proposer_index ==
+            result_proposer_index
         )