Add test_validate_parent_block_proposer and test_validate_state_roots

Author: hwwhww

eth/beacon/state_machines/validation.py

@@ -86,7 +86,6 @@ def validate_parent_block_proposer(crystallized_state: 'CrystallizedState',
 #
 # Attestation validation
 #
-
 def validate_attestation(
         block: BaseBeaconBlock,
         parent_block: BaseBeaconBlock,

tests/beacon/state_machines/test_block_validation.py

@@ -18,7 +18,9 @@
     validate_attestation,
     validate_bitfield,
     validate_justified,
+    validate_parent_block_proposer,
     validate_slot,
+    validate_state_roots,
 )
 
 
@@ -103,6 +105,62 @@ def attestation_validation_fixture(fixture_sm_class,
     )
 
 
+@pytest.mark.parametrize(
+    (
+        'num_validators,cycle_length,'
+        'min_committee_size,shard_count'
+    ),
+    [
+        (100, 50, 10, 10)
+    ],
+)
+def test_validate_parent_block_proposer(attestation_validation_fixture,
+                                        cycle_length):
+    (
+        crystallized_state,
+        _,
+        attestation,
+        block,
+        parent_block,
+        _,
+    ) = attestation_validation_fixture
+
+    validate_parent_block_proposer(
+        crystallized_state,
+        block,
+        parent_block,
+        cycle_length,
+    )
+
+    # Case 1: No attestations
+    block = block.copy(
+        attestations=()
+    )
+    with pytest.raises(ValidationError):
+        validate_parent_block_proposer(
+            crystallized_state,
+            block,
+            parent_block,
+            cycle_length,
+        )
+
+    # Case 2: Proposer didn't attest
+    block = block.copy(
+        attestations=[
+            attestation.copy(
+                attester_bitfield=get_empty_bitfield(10),
+            )
+        ]
+    )
+    with pytest.raises(ValidationError):
+        validate_parent_block_proposer(
+            crystallized_state,
+            block,
+            parent_block,
+            cycle_length,
+        )
+
+
 @pytest.mark.parametrize(
     (
         'num_validators,cycle_length,'
@@ -306,3 +364,31 @@ def test_validate_attestation_aggregate_sig(attestation_validation_fixture, cycl
             attestation_indices,
             parent_hashes,
         )
+
+
+def test_validate_state_roots(genesis_crystallized_state, genesis_active_state, genesis_block):
+
+    validate_state_roots(
+        crystallized_state_root=genesis_crystallized_state.hash,
+        active_state_root=genesis_active_state.hash,
+        block=genesis_block,
+    )
+
+    # Case 1: Wrong crystallized state root
+    with pytest.raises(ValidationError):
+        validate_state_roots(
+            crystallized_state_root=genesis_active_state,
+            active_state_root=genesis_active_state.hash,
+            block=genesis_block.copy(
+                active_state_root=ZERO_HASH32,
+            ),
+        )
+
+    with pytest.raises(ValidationError):
+        validate_state_roots(
+            crystallized_state_root=genesis_active_state,
+            active_state_root=genesis_active_state.hash,
+            block=genesis_block.copy(
+                crystallized_state_root=ZERO_HASH32,
+            ),
+        )

tests/beacon/state_machines/test_proposer.py

@@ -26,10 +26,10 @@
         (1000, 20, 10, 100),
     ]
 )
-def test_propose_block_and_validate_attestation(fixture_sm_class,
-                                                initial_chaindb,
-                                                genesis_block,
-                                                privkeys):
+def test_propose_block(fixture_sm_class,
+                       initial_chaindb,
+                       genesis_block,
+                       privkeys):
     chaindb = initial_chaindb
 
     # Propose a block
@@ -39,7 +39,9 @@ def test_propose_block_and_validate_attestation(fixture_sm_class,
     )
     sm = fixture_sm_class(chaindb, block_1_shell)
 
+    #
     # The proposer of block_1
+    #
     block_committees_info = (
         get_block_committees_info(
             block_1_shell,
@@ -94,7 +96,9 @@ def test_propose_block_and_validate_attestation(fixture_sm_class,
         block_committees_info.proposer_index_in_committee
     )
 
+    #
     # The proposer of block_2
+    #
     block_committees_info = (
         get_block_committees_info(
             block_2_shell,