Clean up succinct hashed bin code

Remove unnecessary or duplicate code in response to
feedback on the pr.

This also removes the existance check in add_delegated_role
so that the value passed will replace any existing delegation.
This allows the caller to replace an outdated role using
this function.

Signed-off-by: marinamoore <[email protected]>

Author: mnm678

tuf/repository_tool.py

@@ -1813,7 +1813,7 @@ def load_signing_key_succinct_delegations(self, key):
 
     # Ensure the private portion of the key is available, otherwise signatures
     # cannot be generated when the metadata file is written to disk.
-    if 'private' not in key['keyval'] or not len(key['keyval']['private']):
+    if not key['keyval'].get('private'):
       raise securesystemslib.exceptions.Error('This is not a private key.')
 
     # Has the key, with the private portion included, been added to the keydb?
@@ -1881,17 +1881,10 @@ def add_delegated_role(self, rolename, targets_object, succinct=False):
           ' not a Targets object.')
 
     if succinct:
-      if rolename in self._succinct_delegations:
-        logger.debug(repr(rolename) + ' already exists.')
-      else:
-        self._succinct_delegations[rolename] = targets_object
+      self._succinct_delegations[rolename] = targets_object
 
     else:
-      if rolename in self._delegated_roles:
-        logger.debug(repr(rolename) + ' already exists.')
-
-      else:
-        self._delegated_roles[rolename] = targets_object
+      self._delegated_roles[rolename] = targets_object
 
 
 
@@ -2685,10 +2678,7 @@ def delegate_hashed_bins(self, list_of_targets, keys_of_hashed_bins,
       # be created, but they will not all be listed in the delegation
         role = {"name":name,
             "keyids": keyids,
-            "threshold": 1,
-            "terminating": False,
             "target_paths": []}
-        ordered_roles.append(role)
       else:
         target_hash_prefixes = []
         for idy in range((idx*prefix_count), (idx*prefix_count)+bin_size):
@@ -2749,14 +2739,6 @@ def delegate_hashed_bins(self, list_of_targets, keys_of_hashed_bins,
                     'terminating': False,
                     'path_hash_prefixes': bin_role['target_hash_prefixes']}
         delegated_roleinfos.append(roleinfo)
-      else:
-        roleinfo = {'name': bin_role['name'],
-                    'keyids': keyids,
-                    'signing_keyids': [],
-                    'version':1,
-                    'threshold': 1,
-                    'terminating': False,
-                    'paths': []}
 
       # Add the new delegation to the top-level 'targets' role object (i.e.,
       # 'repository.targets()').