PR feedback

Author: hwwhww

eth/beacon/helpers.py

@@ -74,21 +74,22 @@ def _get_block_root(
     Return the block root at a recent ``slot``.
     """
     if state_slot > slot + latest_block_roots_length:
-        raise ValueError(
-            "state.slot (%s) should be less than or equal to "
-            "(slot + latest_block_roots_length) (%s), "
-            "where slot=%s, latest_block_roots_length=%s" %
-            (
+        raise ValidationError(
+            "state.slot ({}) should be less than or equal to "
+            "(slot + latest_block_roots_length) ({}), "
+            "where slot={}, latest_block_roots_length={}".format(
                 state_slot,
                 slot + latest_block_roots_length,
                 slot,
                 latest_block_roots_length,
             )
         )
     if slot >= state_slot:
-        raise ValueError(
-            "slot (%s) should be less than state.slot (%s)" %
-            (slot, state_slot)
+        raise ValidationError(
+            "slot ({}) should be less than state.slot ({})".format(
+                slot,
+                state_slot,
+            )
         )
     return latest_block_roots[slot % latest_block_roots_length]
 
@@ -121,16 +122,17 @@ def _get_shard_committees_at_slot(
     earliest_slot_in_array = state_slot - (state_slot % epoch_length) - epoch_length
 
     if earliest_slot_in_array > slot:
-        raise ValueError(
-            "earliest_slot_in_array (%s) should be less than or equal to slot (%s)" %
-            (earliest_slot_in_array, slot)
+        raise ValidationError(
+            "earliest_slot_in_array ({}) should be less than or equal to slot ({})".format(
+                earliest_slot_in_array,
+                slot,
+            )
         )
     if slot >= earliest_slot_in_array + epoch_length * 2:
-        raise ValueError(
-            "slot (%s) should be less than "
-            "(earliest_slot_in_array + epoch_length * 2) (%s), "
-            "where earliest_slot_in_array=%s, epoch_length=%s" %
-            (
+        raise ValidationError(
+            "slot ({}) should be less than "
+            "(earliest_slot_in_array + epoch_length * 2) ({}), "
+            "where earliest_slot_in_array={}, epoch_length={}".format(
                 slot,
                 earliest_slot_in_array + epoch_length * 2,
                 earliest_slot_in_array,

tests/beacon/test_helpers.py

@@ -142,7 +142,7 @@ def test_get_block_root(current_slot,
         )
         assert block_root == blocks[target_slot].root
     else:
-        with pytest.raises(ValueError):
+        with pytest.raises(ValidationError):
             _get_block_root(
                 latest_block_roots,
                 current_slot,
@@ -240,7 +240,7 @@ def test_get_shard_committees_at_slot(
         assert len(shard_committees) > 0
         assert len(shard_committees[0].committee) > 0
     else:
-        with pytest.raises(ValueError):
+        with pytest.raises(ValidationError):
             _get_shard_committees_at_slot(
                 state_slot=state_slot,
                 shard_committees_at_slots=shard_committees_at_slots,