From 5c3e760c2810e5ef567fd6f34940c17b20db3e4b Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Wed, 15 May 2019 18:58:12 +0200
Subject: [PATCH] update remaining imports

---
 .../test_process_crosslinks.py                 | 10 ++++++----
 .../test_process_registry_updates.py           |  5 +----
 .../pyspec/eth2spec/test/test_finality.py      | 10 ++++++----
 test_libs/pyspec/eth2spec/test/test_sanity.py  | 18 ++++++++++--------
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py
index d4e6dc938..f342c5e6d 100644
--- a/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py
+++ b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py
@@ -10,15 +10,17 @@ from eth2spec.phase0.state_transition import (
     state_transition,
 )
 from eth2spec.test.context import spec_state_test
-from eth2spec.test.helpers import (
+from eth2spec.test.helpers.state import (
+    next_epoch,
+    next_slot,
+    apply_empty_block
+)
+from eth2spec.test.helpers.attestations import (
     add_attestation_to_state,
     build_empty_block_for_next_slot,
     fill_aggregate_attestation,
     get_crosslink_committee,
     get_valid_attestation,
-    next_epoch,
-    next_slot,
-    apply_empty_block
 )
 
 
diff --git a/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py
index 970c30942..2086f4ef2 100644
--- a/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py
+++ b/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py
@@ -4,10 +4,7 @@ from eth2spec.phase0.spec import (
     get_current_epoch,
     is_active_validator,
 )
-from eth2spec.test.helpers import (
-    next_epoch,
-)
-
+from eth2spec.test.helpers.state import next_epoch
 from eth2spec.test.context import spec_state_test
 
 
diff --git a/test_libs/pyspec/eth2spec/test/test_finality.py b/test_libs/pyspec/eth2spec/test/test_finality.py
index 75191e59a..732dd8f0c 100644
--- a/test_libs/pyspec/eth2spec/test/test_finality.py
+++ b/test_libs/pyspec/eth2spec/test/test_finality.py
@@ -5,14 +5,16 @@ from eth2spec.phase0.state_transition import (
     state_transition,
 )
 from .context import spec_state_test
-from .helpers import (
-    build_empty_block_for_next_slot,
+from .helpers.state import (
+    next_epoch,
+    apply_empty_block
+)
+from .helpers.block import build_empty_block_for_next_slot
+from .helpers.attestations import (
     fill_aggregate_attestation,
     get_current_epoch,
     get_epoch_start_slot,
     get_valid_attestation,
-    next_epoch,
-    apply_empty_block
 )
 
 
diff --git a/test_libs/pyspec/eth2spec/test/test_sanity.py b/test_libs/pyspec/eth2spec/test/test_sanity.py
index 1951415ac..1509a9843 100644
--- a/test_libs/pyspec/eth2spec/test/test_sanity.py
+++ b/test_libs/pyspec/eth2spec/test/test_sanity.py
@@ -19,18 +19,20 @@ from eth2spec.phase0.spec import (
 from eth2spec.phase0.state_transition import (
     state_transition,
 )
-from .helpers import (
+from .helpers.state import (
     get_balance,
-    build_empty_block_for_next_slot,
-    get_state_root,
-    get_valid_attestation,
-    get_valid_attester_slashing,
-    get_valid_proposer_slashing,
-    get_valid_transfer,
-    prepare_state_and_deposit,
+    get_state_root
+)
+from .helpers.transfers import get_valid_transfer
+from .helpers.block import build_empty_block_for_next_slot
+from .helpers.keys import (
     privkeys,
     pubkeys,
 )
+from .helpers.attester_slashings import get_valid_attester_slashing
+from .helpers.proposer_slashings import get_valid_proposer_slashing
+from .helpers.attestations import get_valid_attestation
+from .helpers.deposits import prepare_state_and_deposit
 
 from .context import spec_state_test