PR feedback

Author: hwwhww

eth/beacon/helpers.py

@@ -214,15 +214,14 @@ def get_attestation_indices(crystallized_state: 'CrystallizedState',
             yield from shard_and_committee.committee
 
 
-@to_tuple
 def get_active_validator_indices(validators: Sequence['ValidatorRecord']) -> Iterable[int]:
     """
     Gets indices of active validators from ``validators``.
     """
-    return [
+    return tuple(
         i for i, v in enumerate(validators)
         if v.status in [ValidatorStatusCode.ACTIVE, ValidatorStatusCode.PENDING_EXIT]
-    ]
+    )
 
 
 #

eth/beacon/utils/random.py

@@ -85,14 +85,13 @@ def shuffle(values: Sequence[Any],
     return output
 
 
-@to_tuple
 def split(values: Sequence[TItem], split_count: int) -> Iterable[Any]:
     """
     Returns the split ``values`` in ``split_count`` pieces in protocol.
     Spec: https://github.com/ethereum/eth2.0-specs/blob/70cef14a08de70e7bd0455d75cf380eb69694bfb/specs/core/0_beacon-chain.md#helper-functions  # noqa: E501
     """
     list_length = len(values)
-    return [
+    return tuple(
         values[(list_length * i // split_count): (list_length * (i + 1) // split_count)]
         for i in range(split_count)
-    ]
+    )

tests/beacon/conftest.py

@@ -1,9 +1,6 @@
 import pytest
 
 from eth_utils import denoms
-from eth_utils import (
-    to_tuple,
-)
 
 from eth.constants import (
     ZERO_HASH32,
@@ -369,11 +366,10 @@ def initial_fork_version():
 # genesis
 #
 @pytest.fixture
-@to_tuple
 def genesis_validators(init_validator_keys,
                        init_randao,
                        deposit_size):
-    return [
+    return tuple(
         ValidatorRecord(
             pubkey=pub,
             withdrawal_credentials=ZERO_HASH32,
@@ -384,4 +380,4 @@ def genesis_validators(init_validator_keys,
             last_status_change_slot=0,
             exit_seq=0,
         ) for pub in init_validator_keys
-    ]
+    )

tests/core/numeric-utils/test_integer_squareroot.py

@@ -1,10 +1,21 @@
 import pytest
+from hypothesis import (
+    given,
+    strategies as st,
+)
 
 from eth.utils.numeric import (
     integer_squareroot,
 )
 
 
+@given(st.integers(min_value=0, max_value=100))
+def test_integer_squareroot_correct(value):
+    result = integer_squareroot(value)
+    assert (result + 1) ** 2 > value
+    assert result ** 2 <= value
+
+
 @pytest.mark.parametrize(
     'value,expected',
     (
@@ -17,14 +28,20 @@
         (65535, 255),
         (65536, 256),
         (18446744073709551615, 4294967295),
-        (1.5, ValueError()),
-        (-1, ValueError()),
     )
 )
-def test_integer_squareroot(value, expected):
-    if isinstance(expected, Exception):
-        with pytest.raises(ValueError):
-            integer_squareroot(value)
-    else:
-        actual = integer_squareroot(value)
-        assert actual == expected
+def test_integer_squareroot_success(value, expected):
+    actual = integer_squareroot(value)
+    assert actual == expected
+
+
+@pytest.mark.parametrize(
+    'value',
+    (
+        (1.5),
+        (-1),
+    )
+)
+def test_integer_squareroot_edge_cases(value):
+    with pytest.raises(ValueError):
+        integer_squareroot(value)