Fix issues after merging develop

Fix failing tests after merging develop into
experimental-client.

Signed-off-by: Teodora Sechkova <tsechkova@vmware.com>

Author: sechkova

tuf/client_rework/metadata_wrapper.py

@@ -95,8 +95,8 @@ def keys(self, role):
         TODO
         """
         keys = []
-        for keyid in self._meta.signed.roles[role]["keyids"]:
-            key_metadata = self._meta.signed.keys[keyid]
+        for keyid in self._meta.signed.roles[role].keyids:
+            key_metadata = self._meta.signed.keys[keyid].to_dict()
             key, dummy = format_metadata_to_key(key_metadata)
             keys.append(key)
 
@@ -106,7 +106,7 @@ def threshold(self, role):
         """
         TODO
         """
-        return self._meta.signed.roles[role]["threshold"]
+        return self._meta.signed.roles[role].threshold
 
 
 class TimestampWrapper(MetadataWrapper):
@@ -158,20 +158,20 @@ def keys(self, role):
         TODO
         """
         keys = []
-        for delegation in self._meta.signed.delegations["roles"]:
-            if delegation["name"] == role:
-                for keyid in delegation["keyids"]:
-                    key_metadata = self._meta.signed.delegations["keys"][keyid]
-                    key, dummy = format_metadata_to_key(key_metadata)
+        for delegation in self._meta.signed.delegations.roles:
+            if delegation.name == role:
+                for keyid in delegation.keyids:
+                    key_metadata = self._meta.signed.delegations.keys[keyid]
+                    key, dummy = format_metadata_to_key(key_metadata.to_dict())
                     keys.append(key)
             return keys
 
     def threshold(self, role):
         """
         TODO
         """
-        for delegation in self._meta.signed.delegations["roles"]:
-            if delegation["name"] == role:
-                return delegation["threshold"]
+        for delegation in self._meta.signed.delegations.roles:
+            if delegation.name == role:
+                return delegation.threshold
 
         return None

tuf/client_rework/updater_rework.py

@@ -558,7 +558,7 @@ def _preorder_depth_first_walk(self, target_filepath) -> Dict:
             # And also decrement number of visited roles.
             number_of_delegations -= 1
             delegations = role_metadata.delegations
-            child_roles = delegations.get("roles", [])
+            child_roles = delegations.roles
 
             if target is None:
 
@@ -570,10 +570,7 @@ def _preorder_depth_first_walk(self, target_filepath) -> Dict:
                         child_role, target_filepath
                     )
 
-                    if (
-                        child_role["terminating"]
-                        and child_role_name is not None
-                    ):
+                    if child_role.terminating and child_role_name is not None:
                         msg = (
                             f"Adding child role {child_role_name}.\n",
                             "Not backtracking to other roles.",
@@ -662,9 +659,9 @@ def _visit_child_role(child_role: Dict, target_filepath: str) -> str:
       Otherwise, we return None.
     """
 
-    child_role_name = child_role["name"]
-    child_role_paths = child_role.get("paths")
-    child_role_path_hash_prefixes = child_role.get("path_hash_prefixes")
+    child_role_name = child_role.name
+    child_role_paths = child_role.paths
+    child_role_path_hash_prefixes = child_role.path_hash_prefixes
 
     if child_role_path_hash_prefixes is not None:
         target_filepath_hash = _get_filepath_hash(target_filepath)