tests: Don't consider MiningChain in tests (ethereum#623)

tests: don't parametrise fixture + don't pass unused fixtures to test.

Don't parametrise `chain_without_block_validation` + don't pass unused fixtures to `test_rpc_against_fixtures()`.

Author: veox

tests/conftest.py

@@ -14,10 +14,7 @@
 from eth_keys import keys
 
 from eth import constants as eth_constants
-from eth.chains.base import (
-    Chain,
-    MiningChain,
-)
+from eth.chains.base import Chain
 from eth.db.atomic import AtomicDB
 # TODO: tests should not be locked into one set of VM rules.  Look at expanding
 # to all mainnet vms.
@@ -251,9 +248,8 @@ def genesis_state(base_genesis_state):
     return base_genesis_state
 
 
-@pytest.fixture(params=[Chain, MiningChain])
+@pytest.fixture
 def chain_without_block_validation(
-        request,
         base_db,
         genesis_state):
     """
@@ -271,8 +267,7 @@ def chain_without_block_validation(
         'validate_block': lambda self, block: None,
     }
     SpuriousDragonVMForTesting = SpuriousDragonVM.configure(validate_seal=lambda block: None)
-    chain_class = request.param
-    klass = chain_class.configure(
+    klass = Chain.configure(
         __name__='TestChainWithoutBlockValidation',
         vm_configuration=(
             (eth_constants.GENESIS_BLOCK_NUMBER, SpuriousDragonVMForTesting),

tests/json-fixtures-over-rpc/test_rpc_fixtures.py

@@ -18,9 +18,6 @@
     is_string,
 )
 
-from eth.chains.base import (
-    MiningChain,
-)
 from eth.chains.mainnet import (
     MainnetChain,
 )
@@ -384,21 +381,12 @@ def chain_fixture(fixture_data):
     return fixture
 
 
-@pytest.fixture
-def chain(chain_without_block_validation):
-    if isinstance(chain_without_block_validation, MiningChain):
-        # These tests are long. For RPC state tests, there shouldn't be any
-        # significant difference between a mining chain and a basic chain.
-        pytest.skip("Only need to test basic chain")
-        return
-
-
 class MainnetFullChain(FullChain):
     vm_configuration = MainnetChain.vm_configuration
 
 
 @pytest.mark.asyncio
-async def test_rpc_against_fixtures(chain, event_bus, ipc_server, chain_fixture, fixture_data):
+async def test_rpc_against_fixtures(event_bus, chain_fixture, fixture_data):
     rpc = RPCServer(
         initialize_eth1_modules(MainnetFullChain(None), event_bus)
     )