Merge pull request #3733 from ethereum/dev
patch for v1.5.0-alpha.1 release
This commit is contained in:
commit
c2544435f4
|
@ -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 get_create_provider_fn(runner_name: str) -> Callable[[SpecForkName, str, str, PresetBaseName], TestProvider]:
|
||||||
def prepare_fn() -> None:
|
def prepare_fn() -> None:
|
||||||
bls.use_milagro()
|
bls.use_fastest()
|
||||||
return
|
return
|
||||||
|
|
||||||
def create_provider(fork_name: SpecForkName, preset_name: PresetBaseName,
|
def create_provider(fork_name: SpecForkName, preset_name: PresetBaseName,
|
||||||
|
|
|
@ -22,7 +22,7 @@ from eth2spec.debug.random_value import (
|
||||||
|
|
||||||
|
|
||||||
def _run_blob_kzg_commitments_merkle_proof_test(spec, state, rng=None):
|
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:
|
if rng is None:
|
||||||
block = build_empty_block_for_next_slot(spec, state)
|
block = build_empty_block_for_next_slot(spec, state)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -1,14 +1,19 @@
|
||||||
from eth2spec.test.helpers.constants import DENEB
|
from eth2spec.test.helpers.constants import DENEB, EIP7594
|
||||||
from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
|
from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
deneb_mods = {key: 'eth2spec.test.deneb.merkle_proof.test_' + key for key in [
|
deneb_mods = {key: 'eth2spec.test.deneb.merkle_proof.test_' + key for key in [
|
||||||
'single_merkle_proof',
|
'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 = {
|
all_mods = {
|
||||||
DENEB: deneb_mods,
|
DENEB: deneb_mods,
|
||||||
|
EIP7594: eip_7594_mods,
|
||||||
}
|
}
|
||||||
|
|
||||||
run_state_test_generators(runner_name="merkle_proof", all_mods=all_mods)
|
run_state_test_generators(runner_name="merkle_proof", all_mods=all_mods)
|
||||||
|
|
Loading…
Reference in New Issue