From c2a4838f5af373bf00edf8c3ed4cf56877632e8d Mon Sep 17 00:00:00 2001
From: Carl Beekhuizen <carl.beek@gmail.com>
Date: Sun, 30 Jun 2019 21:49:29 +0200
Subject: [PATCH] Implments suggestions from review

---
 specs/core/0_beacon-chain.md      | 14 +++++++-------
 test_generators/shuffling/main.py |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md
index 75721ec1a..4554c3195 100644
--- a/specs/core/0_beacon-chain.md
+++ b/specs/core/0_beacon-chain.md
@@ -66,7 +66,7 @@
             - [`is_slashable_attestation_data`](#is_slashable_attestation_data)
             - [`is_valid_merkle_branch`](#is_valid_merkle_branch)
         - [Misc](#misc)
-            - [`compute_shuffle_index`](#compute_shuffle_index)
+            - [`compute_shuffled_index`](#compute_shuffled_index)
             - [`compute_committee`](#compute_committee)
             - [`compute_slot_epoch`](#compute_slot_epoch)
             - [`compute_epoch_start_slot`](#compute_epoch_start_slot)
@@ -662,10 +662,10 @@ def is_valid_merkle_branch(leaf: Hash, branch: Sequence[Hash], depth: uint64, in
 
 ### Misc
 
-#### `compute_shuffle_index`
+#### `compute_shuffled_index`
 
 ```python
-def compute_shuffle_index(index: ValidatorIndex, index_count: uint64, seed: Hash) -> ValidatorIndex:
+def compute_shuffled_index(index: ValidatorIndex, index_count: uint64, seed: Hash) -> ValidatorIndex:
     """
     Return the shuffled validator index corresponding to ``seed`` (and ``index_count``).
     """
@@ -698,7 +698,7 @@ def compute_committee(indices: Sequence[ValidatorIndex],
     """
     start = (len(indices) * index) // count
     end = (len(indices) * (index + 1)) // count
-    return [indices[compute_shuffle_index(ValidatorIndex(i), len(indices), seed)] for i in range(start, end)]
+    return [indices[compute_shuffled_index(ValidatorIndex(i), len(indices), seed)] for i in range(start, end)]
 ```
 
 #### `compute_slot_epoch`
@@ -1677,9 +1677,9 @@ def process_deposit(state: BeaconState, deposit: Deposit) -> None:
     if pubkey not in validator_pubkeys:
         # Verify the deposit signature (proof of possession) for new validators.
         # Note: The deposit contract does not check signatures.
-        # Note: Deposits are valid across forks. thus the deposit domain is retrieved directly from `compute_bls_domain`
-        if not bls_verify(pubkey, signing_root(deposit.data),
-                          deposit.data.signature, compute_bls_domain(DOMAIN_DEPOSIT)):
+        # Note: Deposits are valid across forks, thus the deposit domain is retrieved directly from `compute_bls_domain`
+        domain = compute_bls_domain(DOMAIN_DEPOSIT)
+        if not bls_verify(pubkey, signing_root(deposit.data), deposit.data.signature, domain):
             return
 
         # Add validator and balance entries
diff --git a/test_generators/shuffling/main.py b/test_generators/shuffling/main.py
index bc7907242..8e6125e6f 100644
--- a/test_generators/shuffling/main.py
+++ b/test_generators/shuffling/main.py
@@ -10,7 +10,7 @@ from preset_loader import loader
 def shuffling_case(seed, count):
     yield 'seed', '0x' + seed.hex()
     yield 'count', count
-    yield 'shuffled', [spec.compute_shuffle_index(i, count, seed) for i in range(count)]
+    yield 'shuffled', [spec.compute_shuffled_index(i, count, seed) for i in range(count)]
 
 
 @to_tuple