move other tests to json_infra

Author: gurukamath

tests/test_ethash_general.py renamed to tests/json_infra/test_ethash_general.py

@@ -8,7 +8,7 @@
 from ethereum.frontier.fork_types import Bytes, Uint
 from ethereum.utils.hexadecimal import hex_to_bytes
 
-from .json_infra import TEST_FIXTURES
+from . import TEST_FIXTURES
 
 ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
 

tests/test_genesis.py renamed to tests/json_infra/test_genesis.py

@@ -29,9 +29,9 @@ commands =
         --cov-report "xml:{toxworkdir}/coverage.xml" \
         --no-cov-on-fail \
         --cov-branch \
-        --ignore-glob='tests/fixtures/*' \
+        --ignore-glob='tests/json_infra/fixtures/*' \
         --basetemp="{temp_dir}/pytest" \
-        tests
+        tests/json_infra
 
 [testenv:py3]
 extras =
@@ -87,11 +87,10 @@ commands =
     pytest \
         -m "not slow and not evm_tools" \
         -n auto --maxprocesses 5 \
-        --ignore-glob='tests/fixtures/*' \
-        --ignore-glob='tests/test_t8n.py' \
+        --ignore-glob='tests/json_infra/fixtures/*' \
         --basetemp="{temp_dir}/pytest" \
         --optimized \
-        tests
+        tests/json_infra
 
 [testenv:doc]
 basepython = python3

tests/test_optimized_state.py renamed to tests/json_infra/test_optimized_state.py

@@ -1,6 +1,7 @@
 from ethereum.cancun.blocks import Withdrawal
 from ethereum.ethash import *
 from ethereum.fork_criteria import Unscheduled
+from ethereum.utils.hexadecimal import hex_to_bytes256
 from ethereum_optimized.state_db import State
 from ethereum_spec_tools.docc import *
 from ethereum_spec_tools.evm_tools.daemon import _EvmToolHandler
@@ -17,6 +18,9 @@
 from ethereum_spec_tools.lint.lints.import_hygiene import ImportHygiene
 from ethereum.trace import EvmTracer
 
+# src/ethereum/utils/hexadecimal.py
+hex_to_bytes256
+
 # src/ethereum/cancun/blocks.py
 Withdrawal.validator_index