cleanup hash -> root. misc cleanup

Author: djrtwo

eth/beacon/state_machines/validation.py

@@ -15,14 +15,14 @@
 )
 from eth.beacon.helpers import (
     get_attestation_participants,
-    get_block_hash,
+    get_block_root,
     get_domain,
 )
 from eth.utils import (
     bls
 )
 from eth.beacon.utils.hash import (
-    hash_,
+    hash_eth2,
 )
 from eth.beacon.types.states import BeaconState  # noqa: F401
 from eth.beacon.types.attestations import Attestation  # noqa: F401
@@ -59,8 +59,8 @@ def validate_attestation(state: BeaconState,
 
     validate_attestation_justified_block_root(
         attestation_data=attestation.data,
-        justified_block_root=get_block_hash(
-            state.latest_block_hashes,
+        justified_block_root=get_block_root(
+            state.latest_block_roots,
             current_slot=state.slot,
             slot=attestation.data.justified_slot,
         ),
@@ -144,16 +144,16 @@ def validate_attestation_justified_slot(attestation_data: AttestationData,
 def validate_attestation_justified_block_root(attestation_data: AttestationData,
                                               justified_block_root: Hash32) -> None:
     """
-    Validate ``justified_block_hash`` field of ``attestation_data``.
+    Validate ``justified_block_root`` field of ``attestation_data``.
     Raise ``ValidationError`` if it's invalid.
     """
-    if attestation_data.justified_block_hash != justified_block_root:
+    if attestation_data.justified_block_root != justified_block_root:
         raise ValidationError(
-            "Attestation ``justified_block_hash`` is not equal to the "
+            "Attestation ``justified_block_root`` is not equal to the "
             "``justified_block_root`` at the ``justified_slot``:\n"
             "\tFound: %s, Expected %s at slot %s" %
             (
-                attestation_data.justified_block_hash,
+                attestation_data.justified_block_root,
                 justified_block_root,
                 attestation_data.justified_slot,
             )
@@ -163,41 +163,41 @@ def validate_attestation_justified_block_root(attestation_data: AttestationData,
 def validate_attestation_latest_crosslink_root(attestation_data: AttestationData,
                                                latest_crosslink_shard_block_root: Hash32) -> None:
     """
-    Validate that either the ``latest_crosslink_hash`` or ``shard_block_hash``
+    Validate that either the ``latest_crosslink_root`` or ``shard_block_root``
     field of ``attestation_data`` is the provided ``latest_crosslink_shard_block_root``.
     Raise ``ValidationError`` if it's invalid.
     """
     acceptable_shard_block_roots = [
-        attestation_data.latest_crosslink_hash,
-        attestation_data.shard_block_hash,
+        attestation_data.latest_crosslink_root,
+        attestation_data.shard_block_root,
     ]
     if latest_crosslink_shard_block_root not in acceptable_shard_block_roots:
         raise ValidationError(
-            "Neither the attestation ``latest_crosslink_hash`` nor the attestation "
-            "``shard_block_hash`` are equal to the ``latest_crosslink_shard_block_root``.\n"
+            "Neither the attestation ``latest_crosslink_root`` nor the attestation "
+            "``shard_block_root`` are equal to the ``latest_crosslink_shard_block_root``.\n"
             "\tFound: %s and %s, Expected %s" %
             (
-                attestation_data.latest_crosslink_hash,
-                attestation_data.shard_block_hash,
+                attestation_data.latest_crosslink_root,
+                attestation_data.shard_block_root,
                 latest_crosslink_shard_block_root,
             )
         )
 
 
 def validate_attestation_shard_block_root(attestation_data: AttestationData) -> None:
     """
-    Validate ``shard_block_hash`` field of `attestation_data`.
+    Validate ``shard_block_root`` field of `attestation_data`.
     Raise ``ValidationError`` if it's invalid.
 
-    Note: This is the Phase 0 version of ``shard_block_hash`` validation.
+    Note: This is the Phase 0 version of ``shard_block_root`` validation.
     This is a built-in stub and will be changed in phase 1.
     """
-    if attestation_data.shard_block_hash != ZERO_HASH32:
+    if attestation_data.shard_block_root != ZERO_HASH32:
         raise ValidationError(
-            "Attestation ``shard_block_hash`` is not ZERO_HASH32.\n"
+            "Attestation ``shard_block_root`` is not ZERO_HASH32.\n"
             "\tFound: %s, Expected %s" %
             (
-                attestation_data.shard_block_hash,
+                attestation_data.shard_block_root,
                 ZERO_HASH32,
             )
         )
@@ -228,7 +228,7 @@ def validate_attestation_aggregate_signature(state: BeaconState,
     ]
     group_public_key = bls.aggregate_pubkeys(pubkeys)
 
-    message = hash_(
+    message = hash_eth2(
         rlp.encode(attestation.data) +
         (0).to_bytes(1, "big")
     )

tests/beacon/state_machines/test_attestation_validation.py

@@ -21,16 +21,19 @@
 
 @pytest.mark.parametrize(
     (
-        'attestation_slot,current_slot,epoch_length,'
-        'min_attestation_inclusion_delay,is_valid'
+        'attestation_slot,'
+        'current_slot,'
+        'epoch_length,'
+        'min_attestation_inclusion_delay,'
+        'is_valid,'
     ),
     [
         (0, 5, 5, 1, True),
         (0, 5, 5, 5, True),
-        (0, 5, 5, 6, False),  # not past min inclusion delay
-        (7, 5, 10, 1, False),  # attestation slot in future
+        (0, 5, 5, 6, False),  # attestation_slot + in_attestation_inclusion_delay > current_slot
+        (7, 5, 10, 1, False),  # attestation_slot > current_slot
         (10, 20, 10, 2, True),
-        (9, 20, 10, 2, False),  # more than epoch_length slots have past
+        (9, 20, 10, 2, False),  # attestation_slot + EPOCH_LENGTH < current_slot
     ]
 )
 def test_validate_attestation_slot(sample_attestation_data_params,
@@ -39,8 +42,9 @@ def test_validate_attestation_slot(sample_attestation_data_params,
                                    epoch_length,
                                    min_attestation_inclusion_delay,
                                    is_valid):
-    sample_attestation_data_params['slot'] = attestation_slot
-    attestation_data = AttestationData(**sample_attestation_data_params)
+    attestation_data = AttestationData(**sample_attestation_data_params).copy(
+        slot=attestation_slot,
+    )
 
     if is_valid:
         validate_attestation_slot(
@@ -67,15 +71,15 @@ def test_validate_attestation_slot(sample_attestation_data_params,
         'previous_justified_slot,'
         'justified_slot,'
         'epoch_length,'
-        'is_valid'
+        'is_valid,'
     ),
     [
         (13, 5, 14, 0, 5, 5, True),
-        (13, 0, 14, 0, 5, 5, False),  # targeting previous but should be targeting current
-        (13, 20, 14, 0, 5, 5, False),  # targeting future slot but should be targeting current
+        (13, 0, 14, 0, 5, 5, False),  # targeting previous_justified_slot, should be targeting justified_slot # noqa: E501
+        (13, 20, 14, 0, 5, 5, False),  # targeting future slot, should be targeting justified_slot
         (29, 10, 30, 10, 20, 10, True),
-        (29, 20, 30, 10, 20, 10, False),  # targeting current but should be targeting previous
-        (29, 36, 30, 10, 20, 10, False),  # targeting future slot but should be targeting previous
+        (29, 20, 30, 10, 20, 10, False),  # targeting justified_slot, should be targeting previous_justified_slot # noqa: E501
+        (29, 36, 30, 10, 20, 10, False),  # targeting future slot,  should be targeting previous_justified_slot # noqa: E501
         (10, 10, 10, 10, 10, 10, True),
     ]
 )
@@ -87,9 +91,10 @@ def test_validate_attestation_justified_slot(sample_attestation_data_params,
                                              justified_slot,
                                              epoch_length,
                                              is_valid):
-    sample_attestation_data_params['slot'] = attestation_slot
-    sample_attestation_data_params['justified_slot'] = attestation_justified_slot
-    attestation_data = AttestationData(**sample_attestation_data_params)
+    attestation_data = AttestationData(**sample_attestation_data_params).copy(
+        slot=attestation_slot,
+        justified_slot=attestation_justified_slot,
+    )
 
     if is_valid:
         validate_attestation_justified_slot(
@@ -114,19 +119,20 @@ def test_validate_attestation_justified_slot(sample_attestation_data_params,
     (
         'attestation_justified_block_root,'
         'justified_block_root,'
-        'is_valid'
+        'is_valid,'
     ),
     [
-        (b'\x42' * 32, b'\x35' * 32, False),
+        (b'\x42' * 32, b'\x35' * 32, False),  # attestation.justified_block_root != justified_block_root # noqa: E501
         (b'\x42' * 32, b'\x42' * 32, True),
     ]
 )
 def test_validate_attestation_justified_block_root(sample_attestation_data_params,
                                                    attestation_justified_block_root,
                                                    justified_block_root,
                                                    is_valid):
-    sample_attestation_data_params['justified_block_hash'] = attestation_justified_block_root
-    attestation_data = AttestationData(**sample_attestation_data_params)
+    attestation_data = AttestationData(**sample_attestation_data_params).copy(
+        justified_block_root=attestation_justified_block_root,
+    )
 
     if is_valid:
         validate_attestation_justified_block_root(
@@ -143,10 +149,10 @@ def test_validate_attestation_justified_block_root(sample_attestation_data_param
 
 @pytest.mark.parametrize(
     (
-        'attestation_latest_crosslink_hash,'
-        'attestation_shard_block_hash,'
+        'attestation_latest_crosslink_root,'
+        'attestation_shard_block_root,'
         'latest_crosslink_shard_block_root,'
-        'is_valid'
+        'is_valid,'
     ),
     [
         (b'\x66' * 32, b'\x42' * 32, b'\x35' * 32, False),
@@ -157,13 +163,16 @@ def test_validate_attestation_justified_block_root(sample_attestation_data_param
     ]
 )
 def test_validate_attestation_latest_crosslink_root(sample_attestation_data_params,
-                                                    attestation_latest_crosslink_hash,
-                                                    attestation_shard_block_hash,
+                                                    attestation_latest_crosslink_root,
+                                                    attestation_shard_block_root,
                                                     latest_crosslink_shard_block_root,
                                                     is_valid):
-    sample_attestation_data_params['latest_crosslink_hash'] = attestation_latest_crosslink_hash
-    sample_attestation_data_params['shard_block_hash'] = attestation_shard_block_hash
-    attestation_data = AttestationData(**sample_attestation_data_params)
+    sample_attestation_data_params['latest_crosslink_root'] = attestation_latest_crosslink_root
+    sample_attestation_data_params['shard_block_root'] = attestation_shard_block_root
+    attestation_data = AttestationData(**sample_attestation_data_params).copy(
+        latest_crosslink_root=attestation_latest_crosslink_root,
+        shard_block_root=attestation_shard_block_root,
+    )
 
     if is_valid:
         validate_attestation_latest_crosslink_root(
@@ -180,7 +189,8 @@ def test_validate_attestation_latest_crosslink_root(sample_attestation_data_para
 
 @pytest.mark.parametrize(
     (
-        'attestation_shard_block_hash,is_valid'
+        'attestation_shard_block_root,'
+        'is_valid,'
     ),
     [
         (ZERO_HASH32, True),
@@ -189,10 +199,11 @@ def test_validate_attestation_latest_crosslink_root(sample_attestation_data_para
     ]
 )
 def test_validate_attestation_shard_block_root(sample_attestation_data_params,
-                                               attestation_shard_block_hash,
+                                               attestation_shard_block_root,
                                                is_valid):
-    sample_attestation_data_params['shard_block_hash'] = attestation_shard_block_hash
-    attestation_data = AttestationData(**sample_attestation_data_params)
+    attestation_data = AttestationData(**sample_attestation_data_params).copy(
+        shard_block_root=attestation_shard_block_root,
+    )
 
     if is_valid:
         validate_attestation_shard_block_root(
@@ -206,4 +217,4 @@ def test_validate_attestation_shard_block_root(sample_attestation_data_params,
 
 
 def test_validate_attestation_aggregate_signature():
-    pass
+    pass