Reorg the fixtures

Author: hwwhww

tests/beacon/state_machines/conftest.py

@@ -1,6 +1,10 @@
 import pytest
 
+from eth.beacon.db.chain import BeaconChainDB
 from eth.beacon.state_machines.configs import BeaconConfig
+from eth.beacon.state_machines.forks.serenity import (
+    SerenityBeaconStateMachine,
+)
 
 
 @pytest.fixture
@@ -24,3 +28,23 @@ def config(base_reward_quotient,
         SLOT_DURATION=slot_duration,
         SQRT_E_DROP_TIME=sqrt_e_drop_time,
     )
+
+
+@pytest.fixture
+def fixture_sm_class(config):
+    return SerenityBeaconStateMachine.configure(
+        __name__='SerenityBeaconStateMachineForTesting',
+        config=config,
+    )
+
+
+@pytest.fixture
+def initial_chaindb(base_db,
+                    genesis_block,
+                    genesis_crystallized_state,
+                    genesis_active_state):
+    chaindb = BeaconChainDB(base_db)
+    chaindb.persist_block(genesis_block)
+    chaindb.persist_crystallized_state(genesis_crystallized_state)
+    chaindb.persist_active_state(genesis_active_state, genesis_crystallized_state.hash)
+    return chaindb

tests/beacon/state_machines/test_proposer.py

@@ -3,37 +3,13 @@
 from eth.constants import (
     ZERO_HASH32,
 )
-from eth.beacon.state_machines.forks.serenity import (
-    SerenityBeaconStateMachine,
-)
-from eth.beacon.db.chain import BeaconChainDB
 
 from eth.beacon.helpers import (
     get_block_committees_info,
     get_new_recent_block_hashes,
 )
 
 
-@pytest.fixture
-def fixture_sm_class(config):
-    return SerenityBeaconStateMachine.configure(
-        __name__='SerenityBeaconStateMachineForTesting',
-        config=config,
-    )
-
-
-@pytest.fixture
-def initial_chaindb(base_db,
-                    genesis_block,
-                    genesis_crystallized_state,
-                    genesis_active_state):
-    chaindb = BeaconChainDB(base_db)
-    chaindb.persist_block(genesis_block)
-    chaindb.persist_crystallized_state(genesis_crystallized_state)
-    chaindb.persist_active_state(genesis_active_state, genesis_crystallized_state.hash)
-    return chaindb
-
-
 @pytest.mark.parametrize(
     (
         'num_validators,'

tests/beacon/state_machines/test_state_machines.py

@@ -1,20 +1,16 @@
 from eth.constants import (
     ZERO_HASH32,
 )
+
 from eth.beacon.state_machines.forks.serenity import (
     SerenityBeaconStateMachine,
 )
-from eth.beacon.db.chain import BeaconChainDB
 
 
-def test_state_machine(base_db,
+def test_state_machine(initial_chaindb,
                        genesis_block,
-                       genesis_crystallized_state,
-                       genesis_active_state):
-    chaindb = BeaconChainDB(base_db)
-    chaindb.persist_block(genesis_block)
-    chaindb.persist_crystallized_state(genesis_crystallized_state)
-    chaindb.persist_active_state(genesis_active_state, genesis_crystallized_state.hash)
+                       genesis_crystallized_state):
+    chaindb = initial_chaindb
 
     block_1 = genesis_block.copy(
         parent_hash=genesis_block.hash,