diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py index 7d03436eb8..e20eaba883 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py @@ -5,7 +5,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -44,7 +44,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -152,7 +152,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -186,7 +186,7 @@ def test_invalid( ) def test_gas( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -221,7 +221,7 @@ def test_gas( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py index 94f53e45dd..35d2b9c5db 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py @@ -5,7 +5,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -39,7 +39,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -103,7 +103,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -138,7 +138,7 @@ def test_invalid( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py index 9b2c24232e..7744137acd 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py @@ -5,7 +5,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -72,7 +72,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -156,7 +156,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -190,7 +190,7 @@ def test_invalid( ) def test_gas( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -225,7 +225,7 @@ def test_gas( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py index adcd905427..90931031c3 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py @@ -5,7 +5,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -34,7 +34,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -158,7 +158,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -192,7 +192,7 @@ def test_invalid( ) def test_gas( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -227,7 +227,7 @@ def test_gas( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py index e3236c7787..ea1eca73c7 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py @@ -5,7 +5,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -24,7 +24,7 @@ @pytest.mark.parametrize("input,expected_output", vectors_from_file("multiexp_G2_bls.json")) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -93,7 +93,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -128,7 +128,7 @@ def test_invalid( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2mul.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2mul.py index 118a4449fe..f1ebe2873d 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2mul.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2mul.py @@ -5,7 +5,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -83,7 +83,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -179,7 +179,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -213,7 +213,7 @@ def test_invalid( ) def test_gas( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -248,7 +248,7 @@ def test_gas( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py index 385f3ad38f..cb12b58b28 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py @@ -6,7 +6,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -60,7 +60,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -93,7 +93,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -127,7 +127,7 @@ def test_invalid( ) def test_gas( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -162,7 +162,7 @@ def test_gas( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py index 71247fcb49..165b1a551a 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py @@ -6,7 +6,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -48,7 +48,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -79,7 +79,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -113,7 +113,7 @@ def test_invalid( ) def test_gas( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -148,7 +148,7 @@ def test_gas( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py index 729f685525..3c7499e196 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py @@ -5,7 +5,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Transaction @@ -39,7 +39,7 @@ ) def test_valid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -108,7 +108,7 @@ def test_valid( @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) def test_invalid( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -143,7 +143,7 @@ def test_invalid( ) def test_call_types( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py index d5ae6bb96d..cf0d6d7662 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py @@ -6,7 +6,7 @@ import pytest -from ethereum_test_tools import Environment, StateTestFiller, Transaction +from ethereum_test_tools import Alloc, Environment, StateTestFiller, Transaction from .spec import FP, FP2, Scalar, Spec, ref_spec_2537 @@ -69,7 +69,7 @@ @pytest.mark.parametrize("expected_output,call_succeeds", [pytest.param(b"", True, id="")]) def test_precompile_before_fork( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py index 159cb083ca..444a0e9f52 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py @@ -7,7 +7,7 @@ import pytest -from ethereum_test_tools import Environment +from ethereum_test_tools import Alloc, Environment from ethereum_test_tools import Opcodes as Op from ethereum_test_tools import StateTestFiller, Storage, Transaction @@ -120,7 +120,7 @@ def call_contract_code( @pytest.mark.parametrize("precompile_address", [Spec.G1MSM]) def test_valid_gas_g1msm( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -161,7 +161,7 @@ def test_valid_gas_g1msm( @pytest.mark.parametrize("precompile_address", [Spec.G1MSM]) def test_invalid_gas_g1msm( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -204,7 +204,7 @@ def test_invalid_gas_g1msm( @pytest.mark.parametrize("precompile_address", [Spec.G1MSM]) def test_invalid_length_g1msm( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -245,7 +245,7 @@ def test_invalid_length_g1msm( @pytest.mark.parametrize("precompile_address", [Spec.G2MSM]) def test_valid_gas_g2msm( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -286,7 +286,7 @@ def test_valid_gas_g2msm( @pytest.mark.parametrize("precompile_address", [Spec.G2MSM]) def test_invalid_gas_g2msm( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -329,7 +329,7 @@ def test_invalid_gas_g2msm( @pytest.mark.parametrize("precompile_address", [Spec.G2MSM]) def test_invalid_length_g2msm( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -367,7 +367,7 @@ def test_invalid_length_g2msm( @pytest.mark.parametrize("precompile_address", [Spec.PAIRING]) def test_valid_gas_pairing( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -405,7 +405,7 @@ def test_valid_gas_pairing( @pytest.mark.parametrize("precompile_address", [Spec.PAIRING]) def test_invalid_gas_pairing( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ): @@ -448,7 +448,7 @@ def test_invalid_gas_pairing( @pytest.mark.parametrize("precompile_address", [Spec.PAIRING]) def test_invalid_length_pairing( state_test: StateTestFiller, - pre: dict, + pre: Alloc, post: dict, tx: Transaction, ):