From 78d55839b9abe70a03ba47fda1dbd81a11942194 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Wed, 1 Dec 2021 16:42:12 -0700 Subject: [PATCH] fix tsts --- tests/core/pyspec/eth2spec/capella/__init__.py | 1 - tests/core/pyspec/eth2spec/test/helpers/fork_transition.py | 6 ++++++ tests/core/pyspec/eth2spec/withdrawals/__init__.py | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 tests/core/pyspec/eth2spec/capella/__init__.py delete mode 100644 tests/core/pyspec/eth2spec/withdrawals/__init__.py diff --git a/tests/core/pyspec/eth2spec/capella/__init__.py b/tests/core/pyspec/eth2spec/capella/__init__.py deleted file mode 100644 index 91b4a6853..000000000 --- a/tests/core/pyspec/eth2spec/capella/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import mainnet as spec # noqa:F401 diff --git a/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py b/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py index 853863e51..b75a3ef29 100644 --- a/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py +++ b/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py @@ -12,6 +12,7 @@ from eth2spec.test.helpers.block import ( from eth2spec.test.helpers.constants import ( ALTAIR, MERGE, + CAPELLA, ) from eth2spec.test.helpers.deposits import ( prepare_state_and_deposit, @@ -147,6 +148,8 @@ def do_fork(state, spec, post_spec, fork_epoch, with_block=True, operation_dict= state = post_spec.upgrade_to_altair(state) elif post_spec.fork == MERGE: state = post_spec.upgrade_to_merge(state) + elif post_spec.fork == CAPELLA: + state = post_spec.upgrade_to_capella(state) assert state.fork.epoch == fork_epoch @@ -156,6 +159,9 @@ def do_fork(state, spec, post_spec, fork_epoch, with_block=True, operation_dict= elif post_spec.fork == MERGE: assert state.fork.previous_version == post_spec.config.ALTAIR_FORK_VERSION assert state.fork.current_version == post_spec.config.MERGE_FORK_VERSION + elif post_spec.fork == CAPELLA: + assert state.fork.previous_version == post_spec.config.MERGE_FORK_VERSION + assert state.fork.current_version == post_spec.config.CAPELLA_FORK_VERSION if with_block: return state, _state_transition_and_sign_block_at_slot(post_spec, state, operation_dict=operation_dict) diff --git a/tests/core/pyspec/eth2spec/withdrawals/__init__.py b/tests/core/pyspec/eth2spec/withdrawals/__init__.py deleted file mode 100644 index 91b4a6853..000000000 --- a/tests/core/pyspec/eth2spec/withdrawals/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import mainnet as spec # noqa:F401