Make the tests run on all the mainnet VM rules

Author: Bhargavasomu

tests/conftest.py

@@ -78,16 +78,6 @@ def VM(request):
     return request.param
 
 
-@pytest.fixture
-def block_reward(VM):
-    if VM == ByzantiumVM:
-        return 3 * (10**18)
-    elif VM == ConstantinopleVM:
-        return 2 * (10**18)
-    else:
-        return 5 * (10**18)
-
-
 @pytest.fixture
 def base_db():
     return AtomicDB()

tests/core/chain-object/test_contract_call.py

@@ -3,6 +3,7 @@
 )
 from tests.core.helpers import (
     new_transaction,
+    # vm_specific_chain,
 )
 
 from eth_utils import (
@@ -15,6 +16,16 @@
 from eth.exceptions import (
     InvalidInstruction,
     OutOfGas,
+    Revert,
+)
+
+from eth.vm.forks import (
+    FrontierVM,
+    HomesteadVM,
+    TangerineWhistleVM,
+    SpuriousDragonVM,
+    ByzantiumVM,
+    ConstantinopleVM,
 )
 
 
@@ -120,24 +131,87 @@ def test_get_transaction_result(
 
 
 @pytest.mark.parametrize(
-    'signature, expected',
+    'vm, signature, expected',
     (
         (
+            FrontierVM,
+            'doRevert()',
+            InvalidInstruction,
+        ),
+        (
+            FrontierVM,
+            'useLotsOfGas()',
+            OutOfGas,
+        ),
+
+        (
+            HomesteadVM.configure(
+                support_dao_fork=False,
+            ),
+            'doRevert()',
+            InvalidInstruction,
+        ),
+        (
+            HomesteadVM.configure(
+                support_dao_fork=False,
+            ),
+            'useLotsOfGas()',
+            OutOfGas,
+        ),
+
+        (
+            TangerineWhistleVM,
+            'doRevert()',
+            InvalidInstruction,
+        ),
+        (
+            TangerineWhistleVM,
+            'useLotsOfGas()',
+            OutOfGas,
+        ),
+
+        (
+            SpuriousDragonVM,
             'doRevert()',
             InvalidInstruction,
         ),
         (
+            SpuriousDragonVM,
+            'useLotsOfGas()',
+            OutOfGas,
+        ),
+
+        (
+            ByzantiumVM,
+            'doRevert()',
+            Revert,
+        ),
+        (
+            ByzantiumVM,
+            'useLotsOfGas()',
+            OutOfGas,
+        ),
+
+        (
+            ConstantinopleVM,
+            'doRevert()',
+            Revert,
+        ),
+        (
+            ConstantinopleVM,
             'useLotsOfGas()',
             OutOfGas,
         ),
     ),
 )
 def test_get_transaction_result_revert(
-        chain,
+        vm,
+        chain_from_vm,
         simple_contract_address,
         signature,
         expected):
 
+    chain = chain_from_vm(vm)
     function_selector = function_signature_to_4byte_selector(signature)
     call_txn = new_transaction(
         chain.get_vm(),

tests/core/helpers.py

@@ -31,7 +31,8 @@ def new_transaction(
         private_key=None,
         gas_price=10,
         gas=100000,
-        data=b''):
+        data=b'',
+        chain_id=None):
     """
     Create and return a transaction sending amount from <from_> to <to>.
 
@@ -47,7 +48,10 @@ def new_transaction(
         data=data,
     )
     if private_key:
-        return tx.as_signed_transaction(private_key, chain_id=1)
+        if chain_id is None:
+            return tx.as_signed_transaction(private_key)
+        else:
+            return tx.as_signed_transaction(private_key, chain_id=chain_id)
     else:
         return SpoofTransaction(tx, from_=from_)
 

tests/core/vm/test_vm.py

@@ -47,7 +47,7 @@ def test_mine_block_issues_block_reward(chain):
     block = chain.mine_block()
     vm = chain.get_vm()
     coinbase_balance = vm.state.account_db.get_balance(block.header.coinbase)
-    assert coinbase_balance == constants.BLOCK_REWARD
+    assert coinbase_balance == vm.get_block_reward()
 
 
 def test_import_block(chain, funded_address, funded_address_private_key):