From 2cc7c8798d7ec13880dee51c8c63312828e41568 Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Fri, 19 Jan 2024 18:09:30 +0800 Subject: [PATCH] Fix conflict --- .../pyspec/eth2spec/test/eip7594/unittests/test_security.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_security.py b/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_security.py index 07669dafc..dd85a673e 100644 --- a/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_security.py +++ b/tests/core/pyspec/eth2spec/test/eip7594/unittests/test_security.py @@ -1,10 +1,12 @@ from eth2spec.test.context import ( - MAINNET, spec_test, single_phase, with_eip7594_and_later, with_phases, ) +from eth2spec.test.helpers.constants import ( + MAINNET, +) @with_eip7594_and_later