refactor(plugins): Move pre-alloc logic to a separate filler plugin, rename test_filler (#692)

* refactor(plugins): Move pre-alloc logic to a separate filler pytest-plugin

* fixup: docs navigation

* refactor(plugins): rename `test_filler` -> `filler`

Author: marioevz

docs/library/pytest_plugins/filler.md

@@ -0,0 +1,7 @@
+# Filler Plugin
+
+::: pytest_plugins.filler
+
+::: pytest_plugins.filler.filler
+
+::: pytest_plugins.filler.pre_alloc

docs/library/pytest_plugins/navigation.md

@@ -1,5 +1,5 @@
 <!-- markdownlint-disable MD041 (MD0041=first-line-heading) -->
 * [Overview](index.md)
 * [Forks](forks.md)
-* [Test Filler](test_filler.md)
+* [Test Filler](filler.md)
 * [Spec Version Checker](spec_version_checker.md)

docs/library/pytest_plugins/test_filler.md

@@ -44,3 +44,4 @@
     * [Ethereum Test VM Package](library/ethereum_test_vm.md)
     * [EVM Transition Tool Package](library/evm_transition_tool.md)
     * [Pytest Plugins](library/pytest_plugins/index.md)
+      * [Filler Plugin](library/pytest_plugins/filler.md)

docs/navigation.md

@@ -6,4 +6,4 @@ addopts =
     -rxXs
     --tb short
     -p pytest_plugins.consume.consume
-    -p pytest_plugins.test_help.test_help
+    -p pytest_plugins.help.help

pytest-consume.ini

@@ -7,7 +7,6 @@ testpaths =
     src
 addopts = 
     -p pytester
-    --ignore=src/pytest_plugins/test_filler/test_filler.py
     --ignore=src/pytest_plugins/consume/direct/test_direct.py
     --ignore=src/pytest_plugins/consume/hive_simulators/engine/test_via_engine.py
     --ignore=src/pytest_plugins/consume/hive_simulators/rlp/test_via_rlp.py

pytest-framework.ini

@@ -6,10 +6,11 @@ testpaths = tests/
 markers =
     slow
 addopts = 
-    -p pytest_plugins.test_filler.test_filler
+    -p pytest_plugins.filler.pre_alloc
+    -p pytest_plugins.filler.filler
     -p pytest_plugins.forks.forks
     -p pytest_plugins.spec_version_checker.spec_version_checker
-    -p pytest_plugins.test_help.test_help
+    -p pytest_plugins.help.help
     -m "not eip_version_check"
     --tb short
     --dist loadscope

pytest.ini

@@ -9,7 +9,7 @@
 import pytest
 from click.testing import CliRunner
 
-import pytest_plugins.test_filler.test_filler
+import pytest_plugins.filler.filler
 
 from ..pytest_commands import fill
 
@@ -82,7 +82,7 @@ def default_html_report_filename(self):
         """
         The default filename for fill's pytest html report.
         """
-        return pytest_plugins.test_filler.test_filler.default_html_report_filename()
+        return pytest_plugins.filler.filler.default_html_report_filename()
 
     @pytest.fixture(scope="function")
     def temp_dir(self) -> Generator[Path, None, None]:  # noqa: D102
@@ -103,7 +103,7 @@ def mock_default_output_directory():
             return temp_dir
 
         monkeypatch.setattr(
-            pytest_plugins.test_filler.test_filler,
+            pytest_plugins.filler.filler,
             "default_output_directory",
             mock_default_output_directory,
         )

src/cli/tests/test_pytest_commands.py

@@ -10,7 +10,7 @@
 from click.testing import CliRunner
 
 import cli.check_fixtures
-from ethereum_test_base_types import Account, Hash
+from ethereum_test_base_types import Account, Address, Hash
 from ethereum_test_exceptions import TransactionException
 from ethereum_test_fixtures import BlockchainFixture, FixtureFormats
 from ethereum_test_fixtures.blockchain import FixtureCommon
@@ -38,9 +38,9 @@ def hash(request: pytest.FixtureRequest):
     Set the hash based on the fork and solc version.
     """
     if request.node.funcargs["fork"] == Berlin:
-        return bytes.fromhex("0408c6a5c6")
+        return bytes.fromhex("e57ad774ca")
     elif request.node.funcargs["fork"] == London:
-        return bytes.fromhex("a1babd536a")
+        return bytes.fromhex("3714102a4c")
 
 
 def test_check_helper_fixtures():
@@ -73,12 +73,16 @@ def test_check_helper_fixtures():
 def test_make_genesis(fork: Fork, hash: bytes):  # noqa: D103
     env = Environment()
 
-    pre = Alloc()
-    pre.deploy_contract(
-        (Op.SSTORE(0, Op.ADD(1, 2)) + Op.RETURN(0, 32)),
-        balance=0x0BA1A9CE0BA1A9CE,
+    pre = Alloc(
+        {
+            Address(0x0BA1A9CE0BA1A9CE): Account(balance=0x0BA1A9CE0BA1A9CE),
+            Address(0xC0DE): Account(
+                code=Op.SSTORE(0, Op.ADD(1, 2)) + Op.RETURN(0, 32),
+                balance=0x0BA1A9CE0BA1A9CE,
+                nonce=1,
+            ),
+        }
     )
-    pre.fund_eoa(0x0BA1A9CE0BA1A9CE)
 
     t8n = GethTransitionTool()
     fixture = BlockchainTest(

src/ethereum_test_specs/tests/test_fixtures.py

@@ -8,7 +8,7 @@
 import pytest
 from semver import Version
 
-from ethereum_test_base_types import Account, Bytes, Hash
+from ethereum_test_base_types import Account, Address, Bytes, Hash, TestAddress, TestPrivateKey
 from ethereum_test_fixtures import FixtureFormats
 from ethereum_test_forks import (
     Cancun,
@@ -619,11 +619,15 @@ def test_switch(tx_data: bytes, switch_bytecode: bytes, expected_storage: Mappin
     """
     Test that the switch opcode macro gets executed as using the t8n tool.
     """
-    pre = Alloc()
-    code_address = pre.deploy_contract(switch_bytecode)
-    sender = pre.fund_eoa(10_000_000)
-    tx = Transaction(to=code_address, data=tx_data, gas_limit=1_000_000, sender=sender)
-    post = {sender: Account(nonce=1), code_address: Account(storage=expected_storage)}
+    code_address = Address(0x1000)
+    pre = Alloc(
+        {
+            code_address: Account(code=switch_bytecode),
+            TestAddress: Account(balance=10_000_000),
+        }
+    )
+    tx = Transaction(to=code_address, data=tx_data, gas_limit=1_000_000, secret_key=TestPrivateKey)
+    post = {TestAddress: Account(nonce=1), code_address: Account(storage=expected_storage)}
     state_test = StateTest(
         env=Environment(),
         pre=pre,