Merge pull request #3883 from potuz/run_deneb_tests_in_electra
Run Deneb on_block tests in Electra but not 7594
This commit is contained in:
commit
5c44de2786
|
@ -429,6 +429,13 @@ def with_all_phases_from(earliest_phase, all_phases=ALL_PHASES):
|
|||
return decorator
|
||||
|
||||
|
||||
def with_all_phases_from_except(earliest_phase, except_phases=None):
|
||||
"""
|
||||
A decorator factory for running a tests with every phase except the ones listed
|
||||
"""
|
||||
return with_all_phases_from(earliest_phase, [phase for phase in ALL_PHASES if phase not in except_phases])
|
||||
|
||||
|
||||
def with_all_phases_except(exclusion_phases):
|
||||
"""
|
||||
A decorator factory for running a tests with every phase except the ones listed
|
||||
|
|
|
@ -2,10 +2,13 @@ from random import Random
|
|||
|
||||
from eth2spec.test.context import (
|
||||
spec_state_test,
|
||||
with_phases,
|
||||
with_all_phases_from_except,
|
||||
)
|
||||
|
||||
from eth2spec.test.helpers.constants import DENEB
|
||||
from eth2spec.test.helpers.constants import (
|
||||
DENEB,
|
||||
EIP7594,
|
||||
)
|
||||
|
||||
from eth2spec.test.helpers.block import (
|
||||
build_empty_block_for_next_slot,
|
||||
|
@ -36,7 +39,7 @@ def get_block_with_blob(spec, state, rng=None):
|
|||
return block, blobs, blob_kzg_proofs
|
||||
|
||||
|
||||
@with_phases([DENEB])
|
||||
@with_all_phases_from_except(DENEB, [EIP7594])
|
||||
@spec_state_test
|
||||
def test_simple_blob_data(spec, state):
|
||||
rng = Random(1234)
|
||||
|
@ -71,7 +74,7 @@ def test_simple_blob_data(spec, state):
|
|||
yield 'steps', test_steps
|
||||
|
||||
|
||||
@with_phases([DENEB])
|
||||
@with_all_phases_from_except(DENEB, [EIP7594])
|
||||
@spec_state_test
|
||||
def test_invalid_incorrect_proof(spec, state):
|
||||
rng = Random(1234)
|
||||
|
@ -99,7 +102,7 @@ def test_invalid_incorrect_proof(spec, state):
|
|||
yield 'steps', test_steps
|
||||
|
||||
|
||||
@with_phases([DENEB])
|
||||
@with_all_phases_from_except(DENEB, [EIP7594])
|
||||
@spec_state_test
|
||||
def test_invalid_data_unavailable(spec, state):
|
||||
rng = Random(1234)
|
||||
|
@ -127,7 +130,7 @@ def test_invalid_data_unavailable(spec, state):
|
|||
yield 'steps', test_steps
|
||||
|
||||
|
||||
@with_phases([DENEB])
|
||||
@with_all_phases_from_except(DENEB, [EIP7594])
|
||||
@spec_state_test
|
||||
def test_invalid_wrong_proofs_length(spec, state):
|
||||
rng = Random(1234)
|
||||
|
@ -155,7 +158,7 @@ def test_invalid_wrong_proofs_length(spec, state):
|
|||
yield 'steps', test_steps
|
||||
|
||||
|
||||
@with_phases([DENEB])
|
||||
@with_all_phases_from_except(DENEB, [EIP7594])
|
||||
@spec_state_test
|
||||
def test_invalid_wrong_blobs_length(spec, state):
|
||||
rng = Random(1234)
|
||||
|
|
Loading…
Reference in New Issue