PR feedback

Author: hwwhww

eth/beacon/types/shard_and_committees.py

@@ -1,5 +1,5 @@
 from typing import (
-    Iterable,
+    Sequence,
 )
 
 import rlp
@@ -26,7 +26,7 @@ class ShardAndCommittee(rlp.Serializable):
 
     def __init__(self,
                  shard: int,
-                 committee: Iterable[int])-> None:
+                 committee: Sequence[int])-> None:
         if committee is None:
             committee = ()
 

tests/beacon/types/test_block.py

@@ -1,3 +1,4 @@
+import pytest
 import rlp
 
 from eth.beacon.types.blocks import (
@@ -13,7 +14,7 @@
 
 def test_defaults(sample_beacon_block_params):
     block = BaseBeaconBlock(**sample_beacon_block_params)
-    block.slot == sample_beacon_block_params['slot']
+    assert block.slot == sample_beacon_block_params['slot']
 
 
 def test_update_attestations(sample_attestation_record_params, sample_beacon_block_params):
@@ -32,15 +33,16 @@ def test_hash(sample_beacon_block_params):
     assert block.hash == blake(rlp.encode(block))
 
 
-def test_parent_hash(sample_beacon_block_params):
-    block = BaseBeaconBlock(**sample_beacon_block_params)
-    block = block.copy(
-        ancestor_hashes=(),
-    )
-    assert block.parent_hash is None
-
-    sample_parent_hash = b'\x01' * 32
-    block = block.copy(
-        ancestor_hashes=(sample_parent_hash,),
+@pytest.mark.parametrize(
+    'ancestor_hashes, parent_hash',
+    [
+        ((), None),
+        ((b'\x01' * 32,), b'\x01' * 32),
+        ((b'\x01' * 32, b'\x02' * 32), b'\x01' * 32)
+    ]
+)
+def test_parent_hash(sample_beacon_block_params, ancestor_hashes, parent_hash):
+    block = BaseBeaconBlock(**sample_beacon_block_params).copy(
+        ancestor_hashes=ancestor_hashes,
     )
-    assert block.parent_hash == sample_parent_hash
+    assert block.parent_hash == parent_hash

tests/beacon/types/test_candidate_pow_receipt_root_record.py

@@ -7,7 +7,5 @@ def test_defaults(sample_candidate_pow_receipt_root_record_params):
     candidate_pow_receipt_roots = CandidatePoWReceiptRootRecord(
         **sample_candidate_pow_receipt_root_record_params
     )
-    assert candidate_pow_receipt_roots.candidate_pow_receipt_root == \
-        sample_candidate_pow_receipt_root_record_params['candidate_pow_receipt_root']
-    assert candidate_pow_receipt_roots.votes == \
-        sample_candidate_pow_receipt_root_record_params['votes']
+    assert candidate_pow_receipt_roots.candidate_pow_receipt_root == sample_candidate_pow_receipt_root_record_params['candidate_pow_receipt_root']  # noqa: E501
+    assert candidate_pow_receipt_roots.votes == sample_candidate_pow_receipt_root_record_params['votes']  # noqa: E501

tests/beacon/types/test_states.py

@@ -56,27 +56,28 @@ def test_defaults(sample_beacon_state_params):
     assert state.validators == sample_beacon_state_params['validators']
 
 
-# @pytest.mark.parametrize(
-#     'expected', [(0), (1), (5)]
-# )
-# def test_num_validators(expected,
-#                         deposit_size,
-#                         default_end_dynasty,
-#                         empty_crystallized_state):
-#     validators = [
-#         mock_validator_record(
-#             pubkey,
-#             deposit_size,
-#             default_end_dynasty,
-#             start_dynasty=0,
-#         )
-#         for pubkey in range(expected)
-#     ]
-#     crystallized_state = empty_crystallized_state.copy(
-#         validators=validators,
-#     )
+@pytest.mark.xfail(reason="Need to be fixed when helper function is updated")
+@pytest.mark.parametrize(
+    'expected', [(0), (1), (5)]
+)
+def test_num_validators(expected,
+                        deposit_size,
+                        default_end_dynasty,
+                        empty_crystallized_state):
+    validators = [
+        mock_validator_record(
+            pubkey,
+            deposit_size,
+            default_end_dynasty,
+            start_dynasty=0,
+        )
+        for pubkey in range(expected)
+    ]
+    crystallized_state = empty_crystallized_state.copy(
+        validators=validators,
+    )
 
-#     assert crystallized_state.num_validators == expected
+    assert crystallized_state.num_validators == expected
 
 
 @pytest.mark.parametrize(