From fbccef319b6e9257a8b18db723231922d4c2b447 Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Sat, 27 Apr 2024 15:32:05 +0800 Subject: [PATCH 1/2] Enable EIP7594 merkle proof testgen --- tests/generators/merkle_proof/main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/generators/merkle_proof/main.py b/tests/generators/merkle_proof/main.py index 59a0e8ce65..b7d30fe9e4 100644 --- a/tests/generators/merkle_proof/main.py +++ b/tests/generators/merkle_proof/main.py @@ -1,14 +1,19 @@ -from eth2spec.test.helpers.constants import DENEB -from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators +from eth2spec.test.helpers.constants import DENEB, EIP7594 +from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods if __name__ == "__main__": deneb_mods = {key: 'eth2spec.test.deneb.merkle_proof.test_' + key for key in [ 'single_merkle_proof', ]} + _new_eip7594_mods = {key: 'eth2spec.test.eip7594.merkle_proof.test_' + key for key in [ + 'single_merkle_proof', + ]} + eip_7594_mods = combine_mods(_new_eip7594_mods, deneb_mods) all_mods = { DENEB: deneb_mods, + EIP7594: eip_7594_mods, } run_state_test_generators(runner_name="merkle_proof", all_mods=all_mods) From b681552cf3e1ee0e98f14d0a29c9978c90a17a4e Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Sat, 27 Apr 2024 16:23:08 +0800 Subject: [PATCH 2/2] Use `bls.use_fastest()` in default testgen --- tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py | 2 +- .../test/eip7594/merkle_proof/test_single_merkle_proof.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py b/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py index 17ffe0b468..153d6eee49 100644 --- a/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py +++ b/tests/core/pyspec/eth2spec/gen_helpers/gen_from_tests/gen.py @@ -77,7 +77,7 @@ def get_provider(create_provider_fn: Callable[[SpecForkName, PresetBaseName, str def get_create_provider_fn(runner_name: str) -> Callable[[SpecForkName, str, str, PresetBaseName], TestProvider]: def prepare_fn() -> None: - bls.use_milagro() + bls.use_fastest() return def create_provider(fork_name: SpecForkName, preset_name: PresetBaseName, diff --git a/tests/core/pyspec/eth2spec/test/eip7594/merkle_proof/test_single_merkle_proof.py b/tests/core/pyspec/eth2spec/test/eip7594/merkle_proof/test_single_merkle_proof.py index 222f59b775..e2970a25e4 100644 --- a/tests/core/pyspec/eth2spec/test/eip7594/merkle_proof/test_single_merkle_proof.py +++ b/tests/core/pyspec/eth2spec/test/eip7594/merkle_proof/test_single_merkle_proof.py @@ -22,7 +22,7 @@ def _run_blob_kzg_commitments_merkle_proof_test(spec, state, rng=None): - opaque_tx, blobs, blob_kzg_commitments, proofs = get_sample_opaque_tx(spec, blob_count=1) + opaque_tx, blobs, blob_kzg_commitments, _ = get_sample_opaque_tx(spec, blob_count=1) if rng is None: block = build_empty_block_for_next_slot(spec, state) else: