From dd520c6162a3a9efc72923ea7d89bf9acf338ce3 Mon Sep 17 00:00:00 2001
From: Danny Ryan <dannyjryan@gmail.com>
Date: Wed, 3 Apr 2019 11:22:14 +1100
Subject: [PATCH] fix tests for get_domain PR

---
 tests/phase0/helpers.py     | 26 ++++++++++++--------------
 tests/phase0/test_sanity.py |  6 ++----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/tests/phase0/helpers.py b/tests/phase0/helpers.py
index 33f394def..6a7ffd5dd 100644
--- a/tests/phase0/helpers.py
+++ b/tests/phase0/helpers.py
@@ -50,7 +50,7 @@ pubkey_to_privkey = {pubkey: privkey for privkey, pubkey in zip(privkeys, pubkey
 def create_mock_genesis_validator_deposits(num_validators, deposit_data_leaves=None):
     if not deposit_data_leaves:
         deposit_data_leaves = []
-    proof_of_possession = b'\x33' * 96
+    signature = b'\x33' * 96
 
     deposit_data_list = []
     for i in range(num_validators):
@@ -60,7 +60,7 @@ def create_mock_genesis_validator_deposits(num_validators, deposit_data_leaves=N
             # insecurely use pubkey as withdrawal key as well
             withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:],
             amount=spec.MAX_DEPOSIT_AMOUNT,
-            proof_of_possession=proof_of_possession,
+            signature=signature,
         )
         item = hash(deposit_data.serialize())
         deposit_data_leaves.append(item)
@@ -120,18 +120,17 @@ def build_deposit_data(state, pubkey, privkey, amount):
         # insecurely use pubkey as withdrawal key as well
         withdrawal_credentials=spec.BLS_WITHDRAWAL_PREFIX_BYTE + hash(pubkey)[1:],
         amount=amount,
-        proof_of_possession=EMPTY_SIGNATURE,
+        signature=EMPTY_SIGNATURE,
     )
-    proof_of_possession = bls.sign(
+    signature = bls.sign(
         message_hash=signed_root(deposit_data),
         privkey=privkey,
         domain=get_domain(
-            state.fork,
-            get_current_epoch(state),
+            state,
             spec.DOMAIN_DEPOSIT,
         )
     )
-    deposit_data.proof_of_possession = proof_of_possession
+    deposit_data.signature = signature
     return deposit_data
 
 
@@ -173,9 +172,9 @@ def build_voluntary_exit(state, epoch, validator_index, privkey):
         message_hash=signed_root(voluntary_exit),
         privkey=privkey,
         domain=get_domain(
-            fork=state.fork,
-            epoch=epoch,
+            state=state,
             domain_type=spec.DOMAIN_VOLUNTARY_EXIT,
+            message_epoch=epoch,
         )
     )
 
@@ -224,9 +223,8 @@ def get_valid_proposer_slashing(state):
     header_2.slot = slot + 1
 
     domain = get_domain(
-        fork=state.fork,
-        epoch=get_current_epoch(state),
-        domain_type=spec.DOMAIN_BEACON_BLOCK,
+        state=state,
+        domain_type=spec.DOMAIN_BEACON_PROPOSER,
     )
     header_1.signature = bls.sign(
         message_hash=signed_root(header_1),
@@ -307,8 +305,8 @@ def get_attestation_signature(state, attestation_data, privkey, custody_bit=0b0)
         message_hash=message_hash,
         privkey=privkey,
         domain=get_domain(
-            fork=state.fork,
-            epoch=slot_to_epoch(attestation_data.slot),
+            state=state,
             domain_type=spec.DOMAIN_ATTESTATION,
+            message_epoch=slot_to_epoch(attestation_data.slot),
         )
     )
diff --git a/tests/phase0/test_sanity.py b/tests/phase0/test_sanity.py
index 90825242f..b86187ec8 100644
--- a/tests/phase0/test_sanity.py
+++ b/tests/phase0/test_sanity.py
@@ -303,8 +303,7 @@ def test_voluntary_exit(state):
         message_hash=signed_root(voluntary_exit),
         privkey=privkeys[validator_index],
         domain=get_domain(
-            fork=pre_state.fork,
-            epoch=get_current_epoch(pre_state),
+            state=pre_state,
             domain_type=spec.DOMAIN_VOLUNTARY_EXIT,
         )
     )
@@ -390,8 +389,7 @@ def test_transfer(state):
         message_hash=signed_root(transfer),
         privkey=transfer_privkey,
         domain=get_domain(
-            fork=pre_state.fork,
-            epoch=get_current_epoch(pre_state),
+            state=pre_state,
             domain_type=spec.DOMAIN_TRANSFER,
         )
     )