Merge pull request #2 from marioevz/pytest-eip-4844-blobhash-tests

Fixes to EIP 4844 blobhash PR
ethereum · Jun 6, 2023 · 351c984 · 351c984
2 parents 7b77648 + 9268288
commit 351c984
Show file tree

Hide file tree

Showing 7 changed files with 490 additions and 414 deletions.
diff --git a/fillers/eips/eip4844/point_evaluation_vectors/go_kzg_4844_verify_kzg_proof.json b/fillers/eips/eip4844/point_evaluation_vectors/go_kzg_4844_verify_kzg_proof.json
diff --git a/fillers/eips/eip4844/point_evaluation_vectors/precompile_endianess.py b/fillers/eips/eip4844/point_evaluation_vectors/precompile_endianess.py
diff --git a/fillers/eips/eip4844/test_blobhash_opcode.py b/fillers/eips/eip4844/test_blobhash_opcode.py
@@ -29,7 +29,7 @@
     random_blob_hashes,
 )
 
-# TODO: uncomment post fork improvement merged
+# TODO: un-comment post fork improvement merged
 # pytestmark = pytest.mark.valid_from("Cancun")
 pytestmark = pytest.mark.parametrize("fork", forks_from(Cancun))
 

diff --git a/fillers/eips/eip4844/test_blobhash_opcode_contexts.py b/fillers/eips/eip4844/test_blobhash_opcode_contexts.py
@@ -18,7 +18,7 @@
 
 from .util_blobhash import BlobhashContext, simple_blob_hashes
 
-# TODO: uncomment post fork improvement merged
+# TODO: un-comment post fork improvement merged
 # pytestmark = pytest.mark.valid_from("Cancun")
 pytestmark = pytest.mark.parametrize("fork", forks_from(Cancun))
 

diff --git a/pytest.ini b/pytest.ini
@@ -3,7 +3,6 @@ console_output_style = count
 minversion = 7.0
 python_files = *.py
 testpaths = fillers/
-norecursedirs = fillers/eips/eip4844
 addopts = 
     -p pytest_plugins.latest_fork
     -p pytest_plugins.spec_version_checker

diff --git a/src/ethereum_test_tools/common/helpers.py b/src/ethereum_test_tools/common/helpers.py
@@ -136,7 +136,9 @@ def to_hash(input: int | str) -> str:
     return "0x" + to_hash_bytes(input).hex()
 
 
-def add_kzg_version(b_hashes: List[bytes], kzg_version: int) -> List[bytes]:
+def add_kzg_version(
+    b_hashes: List[bytes | int | str], kzg_version: int
+) -> List[bytes]:
     """
     Adds the Kzg Version to each blob hash.
     """

diff --git a/whitelist.txt b/whitelist.txt
@@ -44,6 +44,7 @@ wd
 wds
 u256
 utils
+util
 validator
 vm
 gwei
@@ -259,6 +260,7 @@ modifyitems
 originalname
 parametrized
 param
+params
 parametrize
 pytestmark
 runtest