Add is_active property to ValidatorRecord and refactor helpers

Author: onyb

eth/beacon/helpers.py

@@ -27,9 +27,8 @@
     clamp,
 )
 
-from eth.beacon.block_committees_info import BlockCommitteesInfo
-from eth.beacon.enums import (
-    ValidatorStatusCode,
+from eth.beacon.block_committees_info import (
+    BlockCommitteesInfo,
 )
 from eth.beacon.types.shard_committees import (
     ShardCommittee,
@@ -156,7 +155,7 @@ def get_active_validator_indices(validators: Sequence['ValidatorRecord']) -> Tup
     """
     return tuple(
         i for i, v in enumerate(validators)
-        if v.status in [ValidatorStatusCode.ACTIVE, ValidatorStatusCode.ACTIVE_PENDING_EXIT]
+        if v.is_active
     )
 
 

eth/beacon/types/validator_records.py

@@ -3,6 +3,9 @@
 )
 import rlp
 
+from eth.beacon.enums import (
+    ValidatorStatusCode,
+)
 from eth.rlp.sedes import (
     uint64,
     uint256,
@@ -52,3 +55,13 @@ def __init__(self,
             latest_status_change_slot=latest_status_change_slot,
             exit_count=exit_count,
         )
+
+    @property
+    def is_active(self) -> bool:
+        """
+        Returns ``True`` if the validator is active.
+        """
+        return self.status in [
+            ValidatorStatusCode.ACTIVE,
+            ValidatorStatusCode.ACTIVE_PENDING_EXIT
+        ]

tests/beacon/types/test_validator_record.py

@@ -1,3 +1,6 @@
+from eth.beacon.enums import (
+    ValidatorStatusCode,
+)
 from eth.beacon.types.validator_records import (
     ValidatorRecord,
 )
@@ -7,3 +10,27 @@ def test_defaults(sample_validator_record_params):
     validator = ValidatorRecord(**sample_validator_record_params)
     assert validator.pubkey == sample_validator_record_params['pubkey']
     assert validator.withdrawal_credentials == sample_validator_record_params['withdrawal_credentials']  # noqa: E501
+
+
+def test_is_active(sample_validator_record_params):
+    validator_record_params = {
+        **sample_validator_record_params,
+        'status': ValidatorStatusCode.ACTIVE
+    }
+    validator = ValidatorRecord(**validator_record_params)
+    assert validator.is_active
+
+    validator_record_params = {
+        **sample_validator_record_params,
+        'status': ValidatorStatusCode.ACTIVE_PENDING_EXIT
+    }
+    validator = ValidatorRecord(**validator_record_params)
+    assert validator.is_active
+
+
+    validator_record_params = {
+        **sample_validator_record_params,
+        'status': ValidatorStatusCode.EXITED_WITHOUT_PENALTY
+    }
+    validator = ValidatorRecord(**validator_record_params)
+    assert not validator.is_active