fix: Tox

Author: marioevz

src/ethereum_clis/cli_types.py

@@ -181,7 +181,7 @@ def print(self):
 }
 
 
-def validate_opcode(obj: Any) -> Opcodes:
+def validate_opcode(obj: Any) -> Opcodes | Opcode:
     """Validate an opcode from a string."""
     if isinstance(obj, Opcode) or isinstance(obj, Opcodes):
         return obj
@@ -207,7 +207,7 @@ def __add__(self, other: Self) -> Self:
         new_dict = self.model_dump() | other.model_dump()
         for match_key in self.root.keys() & other.root.keys():
             new_dict[match_key] = self.root[match_key] + other.root[match_key]
-        return OpcodeCount(new_dict)
+        return self.__class__(new_dict)
 
 
 class Result(CamelModel):

src/ethereum_test_specs/blockchain.py

@@ -752,6 +752,9 @@ def make_fixture(
                 )
         self.check_exception_test(exception=invalid_blocks > 0)
         self.verify_post_state(t8n, t8n_state=alloc)
+        info = {}
+        if self._opcode_count is not None:
+            info["opcode_count"] = self._opcode_count.model_dump()
         return BlockchainFixture(
             fork=fork,
             genesis=genesis.header,
@@ -766,9 +769,7 @@ def make_fixture(
                 blob_schedule=FixtureBlobSchedule.from_blob_schedule(fork.blob_schedule()),
                 chain_id=self.chain_id,
             ),
-            info={
-                "opcode_count": self._opcode_count.model_dump(),
-            },
+            info=info,
         )
 
     def make_hive_fixture(
@@ -821,6 +822,9 @@ def make_hive_fixture(
         self.verify_post_state(t8n, t8n_state=alloc)
 
         # Create base fixture data, common to all fixture formats
+        info = {}
+        if self._opcode_count is not None:
+            info["opcode_count"] = self._opcode_count.model_dump()
         fixture_data = {
             "fork": fork,
             "genesis": genesis.header,
@@ -834,9 +838,7 @@ def make_hive_fixture(
                 chain_id=self.chain_id,
                 blob_schedule=FixtureBlobSchedule.from_blob_schedule(fork.blob_schedule()),
             ),
-            "info": {
-                "opcode_count": self._opcode_count.model_dump(),
-            },
+            "info": info,
         }
 
         # Add format-specific fields