refactor: update entity ID fuzz target and improve exception handling in fuzzers

Signed-off-by: Ntege Daniel <danientege785@gmail.com>

Author: danielmarv

.clusterfuzzlite/entity_id_fuzzer.py

@@ -1,4 +1,4 @@
-"""Atheris fuzz target: entity ID string parsing (AccountId, TokenId, ContractId)."""
+"""Atheris fuzz target: entity ID string parsing."""
 
 from __future__ import annotations
 
@@ -8,10 +8,16 @@
 
 
 with atheris.instrument_imports():
-    from hiero_sdk_python import AccountId, TokenId
-    from hiero_sdk_python.contract.contract_id import ContractId
+    from hiero_sdk_python import AccountId, ContractId, FileId, TokenId, TopicId
 
-_CLASSES = (AccountId, TokenId, ContractId)
+_CLASSES = (AccountId, TokenId, ContractId, FileId, TopicId)
+
+
+def _try_parse_entity_id(entity_id_class, text: str) -> None:
+    try:
+        entity_id_class.from_string(text)
+    except (TypeError, ValueError):
+        pass
 
 
 def TestOneInput(data: bytes) -> None:
@@ -20,10 +26,7 @@ def TestOneInput(data: bytes) -> None:
     text = fdp.ConsumeUnicodeNoSurrogates(256)
 
     for cls in _CLASSES:
-        try:
-            cls.from_string(text)
-        except Exception:  # noqa: PERF203
-            pass
+        _try_parse_entity_id(cls, text)
 
 
 atheris.Setup(sys.argv, TestOneInput)

.clusterfuzzlite/keys_fuzzer.py

@@ -37,7 +37,7 @@ def TestOneInput(data: bytes) -> None:
         else:
             raw = fdp.ConsumeBytes(128)
             _quiet(PublicKey.from_bytes, raw)
-    except Exception:
+    except ValueError:
         pass
 
 

.clusterfuzzlite/transaction_from_bytes_fuzzer.py

@@ -16,7 +16,7 @@ def TestOneInput(data: bytes) -> None:
     try:
         tx = Transaction.from_bytes(data)
         tx.to_bytes()
-    except Exception:
+    except ValueError:
         # All parsing / validation failures are expected; only unhandled
         # exceptions that escape this function are reported as fuzzer crashes.
         pass

src/hiero_sdk_python/__init__.py

@@ -31,6 +31,7 @@
 from .contract.contract_execute_transaction import ContractExecuteTransaction
 from .contract.contract_function_parameters import ContractFunctionParameters
 from .contract.contract_function_result import ContractFunctionResult
+from .contract.contract_id import ContractId
 from .contract.contract_info import ContractInfo
 from .contract.contract_info_query import ContractInfoQuery
 from .contract.contract_update_transaction import ContractUpdateTransaction
@@ -52,6 +53,7 @@
 from .file.file_contents_query import FileContentsQuery
 from .file.file_create_transaction import FileCreateTransaction
 from .file.file_delete_transaction import FileDeleteTransaction
+from .file.file_id import FileId
 from .file.file_info import FileInfo
 from .file.file_info_query import FileInfoQuery
 from .file.file_update_transaction import FileUpdateTransaction
@@ -249,6 +251,7 @@
     # File
     "FileCreateTransaction",
     "FileAppendTransaction",
+    "FileId",
     "FileInfoQuery",
     "FileInfo",
     "FileContentsQuery",
@@ -257,6 +260,7 @@
     # Contract
     "ContractCreateTransaction",
     "ContractCallQuery",
+    "ContractId",
     "ContractInfoQuery",
     "ContractBytecodeQuery",
     "ContractExecuteTransaction",