add back in get_active_validator_indices

This commit is contained in:
Danny Ryan 2018-11-04 23:26:24 +01:00
parent 41105c28d0
commit 83c624d0e8
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
1 changed files with 6 additions and 3 deletions

View File

@ -311,7 +311,10 @@ The crystallized state recalculation generally focuses on changes to the validat
Below are various helper functions. Below are various helper functions.
First a function that shuffles the validator list: def get_active_validator_indices(validators)
return [i for i, v in enumerate(validators) if v.status == ACTIVE]
The following is a function that shuffles the validator list:
```python ```python
def shuffle(values: List[Any], def shuffle(values: List[Any],
@ -399,7 +402,7 @@ Now, our combined helper method:
def get_new_shuffling(seed: Hash32, def get_new_shuffling(seed: Hash32,
validators: List[ValidatorRecord], validators: List[ValidatorRecord],
crosslinking_start_shard: int) -> List[List[ShardAndCommittee]]: crosslinking_start_shard: int) -> List[List[ShardAndCommittee]]:
active_validators = [i for i, v in enumerate(validators) if v.status == ACTIVE] active_validators = get_active_validator_indices(validators)
active_validators_size = len(active_validators) active_validators_size = len(active_validators)
committees_per_slot = clamp( committees_per_slot = clamp(
@ -747,7 +750,7 @@ Then, run the following algorithm to update the validator set:
```python ```python
def change_validators(validators: List[ValidatorRecord]) -> None: def change_validators(validators: List[ValidatorRecord]) -> None:
# The active validator set # The active validator set
active_validators = [i for i, v in enumerate(validators) if v.status == ACTIVE] active_validators = get_active_validator_indices(validators)
# The total balance of active validators # The total balance of active validators
total_balance = sum([v.balance for i, v in enumerate(validators) if i in active_validators]) total_balance = sum([v.balance for i, v in enumerate(validators) if i in active_validators])
# The maximum total wei that can deposit+withdraw # The maximum total wei that can deposit+withdraw