Make (De)SerializationError a RepositoryError

SerializationError and DeserializationError are both errors coming
from the repository side looking from the clients point of view.
That's why it makes sense to make them repository errors.

Signed-off-by: Martin Vrachev <[email protected]>

Author: MVrachev

tuf/api/serialization/__init__.py

@@ -17,17 +17,18 @@
 import abc
 from typing import TYPE_CHECKING
 
+from tuf.api.exceptions import RepositoryError
+
 if TYPE_CHECKING:
     # pylint: disable=cyclic-import
     from tuf.api.metadata import Metadata, Signed
 
 
-# TODO: Should these be in tuf.exceptions or inherit from tuf.exceptions.Error?
-class SerializationError(Exception):
+class SerializationError(RepositoryError):
     """Error during serialization."""
 
 
-class DeserializationError(Exception):
+class DeserializationError(RepositoryError):
     """Error during deserialization."""
 
 

tuf/ngclient/_internal/trusted_metadata_set.py

@@ -74,7 +74,6 @@
 
 from tuf.api import exceptions
 from tuf.api.metadata import Metadata, Root, Snapshot, Targets, Timestamp
-from tuf.api.serialization import DeserializationError
 
 logger = logging.getLogger(__name__)
 
@@ -161,10 +160,7 @@ def update_root(self, data: bytes) -> Metadata[Root]:
             raise RuntimeError("Cannot update root after timestamp")
         logger.debug("Updating root")
 
-        try:
-            new_root = Metadata[Root].from_bytes(data)
-        except DeserializationError as e:
-            raise exceptions.RepositoryError("Failed to load root") from e
+        new_root = Metadata[Root].from_bytes(data)
 
         if new_root.signed.type != Root.type:
             raise exceptions.RepositoryError(
@@ -218,10 +214,7 @@ def update_timestamp(self, data: bytes) -> Metadata[Timestamp]:
         # No need to check for 5.3.11 (fast forward attack recovery):
         # timestamp/snapshot can not yet be loaded at this point
 
-        try:
-            new_timestamp = Metadata[Timestamp].from_bytes(data)
-        except DeserializationError as e:
-            raise exceptions.RepositoryError("Failed to load timestamp") from e
+        new_timestamp = Metadata[Timestamp].from_bytes(data)
 
         if new_timestamp.signed.type != Timestamp.type:
             raise exceptions.RepositoryError(
@@ -311,10 +304,7 @@ def update_snapshot(
         if not trusted:
             snapshot_meta.verify_length_and_hashes(data)
 
-        try:
-            new_snapshot = Metadata[Snapshot].from_bytes(data)
-        except DeserializationError as e:
-            raise exceptions.RepositoryError("Failed to load snapshot") from e
+        new_snapshot = Metadata[Snapshot].from_bytes(data)
 
         if new_snapshot.signed.type != Snapshot.type:
             raise exceptions.RepositoryError(
@@ -423,10 +413,7 @@ def update_delegated_targets(
 
         meta.verify_length_and_hashes(data)
 
-        try:
-            new_delegate = Metadata[Targets].from_bytes(data)
-        except DeserializationError as e:
-            raise exceptions.RepositoryError("Failed to load snapshot") from e
+        new_delegate = Metadata[Targets].from_bytes(data)
 
         if new_delegate.signed.type != Targets.type:
             raise exceptions.RepositoryError(
@@ -455,10 +442,7 @@ def _load_trusted_root(self, data: bytes) -> None:
         Note that an expired initial root is considered valid: expiry is
         only checked for the final root in update_timestamp().
         """
-        try:
-            new_root = Metadata[Root].from_bytes(data)
-        except DeserializationError as e:
-            raise exceptions.RepositoryError("Failed to load root") from e
+        new_root = Metadata[Root].from_bytes(data)
 
         if new_root.signed.type != Root.type:
             raise exceptions.RepositoryError(