do not export rlp_decoded if there is BlockException.RLP_STRUCTURES_E…

…NCODING (#427)
ethereum · Feb 9, 2024 · 3376669 · 3376669
1 parent 7c03cb5
commit 3376669
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/ethereum_test_tools/exceptions/exceptions.py b/src/ethereum_test_tools/exceptions/exceptions.py
@@ -43,6 +43,12 @@ class ExceptionBase(Enum):
     Base class for exceptions.
     """
 
+    def __contains__(self, exception) -> bool:
+        """
+        Checks if provided exception is equal to this
+        """
+        return self == exception
+
     def __or__(
         self,
         other: Union["TransactionException", "BlockException", ExceptionList],
@@ -147,6 +153,10 @@ class BlockException(ExceptionBase):
     """
     Block's excess blob gas in header is incorrect.
     """
+    RLP_STRUCTURES_ENCODING = auto()
+    """
+    Block's rlp encoding is valid but ethereum structures in it are invalid
+    """
 
 
 ExceptionType = Union[TransactionException, BlockException, ExceptionList]
diff --git a/src/ethereum_test_tools/spec/blockchain/blockchain_test.py b/src/ethereum_test_tools/spec/blockchain/blockchain_test.py
@@ -38,6 +38,7 @@
 from ..debugging import print_traces
 from .types import (
     Block,
+    BlockException,
     Fixture,
     FixtureBlock,
     FixtureEngineNewPayload,
@@ -353,7 +354,11 @@ def make_fixture(
                         InvalidFixtureBlock(
                             rlp=rlp,
                             expected_exception=block.exception,
-                            rlp_decoded=replace(fixture_block, rlp=None),
+                            rlp_decoded=(
+                                None
+                                if BlockException.RLP_STRUCTURES_ENCODING in block.exception
+                                else replace(fixture_block, rlp=None)
+                            ),
                         ),
                     )
             else:

diff --git a/tests/cancun/eip4844_blobs/test_blob_txs.py b/tests/cancun/eip4844_blobs/test_blob_txs.py
@@ -1153,7 +1153,8 @@ def test_invalid_blob_tx_contract_creation(
         blocks=[
             Block(
                 txs=txs,
-                exception=TransactionException.TYPE_3_TX_CONTRACT_CREATION,
+                exception=TransactionException.TYPE_3_TX_CONTRACT_CREATION
+                | BlockException.RLP_STRUCTURES_ENCODING,
                 header_verify=header_verify,
             )
         ],

diff --git a/tests/cancun/eip4844_blobs/test_blob_txs_full.py b/tests/cancun/eip4844_blobs/test_blob_txs_full.py
@@ -12,6 +12,7 @@
     Address,
     Block,
     BlockchainTestFiller,
+    BlockException,
     Environment,
     Header,
     TestAddress,
@@ -256,7 +257,9 @@ def blocks(
     if any(txs_wrapped_blobs):
         # This is a block exception because the invalid block is only created in the RLP version,
         # not in the transition tool.
-        block_error = TransactionException.TYPE_3_TX_WITH_FULL_BLOBS
+        block_error = (
+            TransactionException.TYPE_3_TX_WITH_FULL_BLOBS | BlockException.RLP_STRUCTURES_ENCODING
+        )
     if len(txs) > 0:
         header_blob_gas_used = (
             sum(