update tests for hash bin naming scheme.

This updates the succinct hash bin delegation tests
to use the new naming convention. It also fixes a
small variable reuse issue in repository lib

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

Author: mnm678

tests/test_repository_tool.py

@@ -295,7 +295,7 @@ def test_writeall(self):
     # Test if succinct delegations are written on writeall
     list_of_targets = [target1, target2]
     repository.targets.delegate_hashed_bins(list_of_targets, [role1_pubkey],
-                                            4, True)
+                                            4, True, prefix='targets.hbd-')
     repository.targets.load_signing_key_succinct_delegations(role1_privkey)
     repository.writeall()
 
@@ -1623,7 +1623,7 @@ def check_prefixes_match_range():
     # Test delegate_hashed_bins() and verify that 16 hashed bins have
     # been delegated in the parent's roleinfo.
     self.targets_object.delegate_hashed_bins(list_of_targets, public_keys,
-                                             number_of_bins=16, prefix='bin')
+                                             number_of_bins=16, prefix='bin-')
 
     # The expected child rolenames, since 'number_of_bins' = 16
     delegated_rolenames = ["{}{:x}".format('bin-',
@@ -1635,7 +1635,7 @@ def check_prefixes_match_range():
 
     # Test delegate_hashed_bins with a custom prefix
     self.targets_object.delegate_hashed_bins(list_of_targets, public_keys,
-                                  number_of_bins=4, prefix="pre")
+                                  number_of_bins=4, prefix="pre-")
 
     delegated_rolenames.append("pre-0")
     delegated_rolenames.append("pre-1")
@@ -1646,11 +1646,11 @@ def check_prefixes_match_range():
                      sorted(delegated_rolenames))
 
     # Test succinct hashed bin delegations
-    self.targets_object.delegate_hashed_bins(list_of_targets, public_keys,
-                                            number_of_bins=16, succinct=True)
-
     delegated_rolename = self.targets_object.rolename + '.hbd-'
 
+    self.targets_object.delegate_hashed_bins(list_of_targets, public_keys,
+        number_of_bins=16, succinct=True, prefix=delegated_rolename)
+
     # Create a list of hex-suffixed names from "<name>-0" to "<name>-f"
     bin_names = ["{}{:x}".format(delegated_rolename,
         i) for i in range(0, 16)]
@@ -1664,7 +1664,7 @@ def check_prefixes_match_range():
 
     # Test succinct hashed bin delegation with a custom prefix
     self.targets_object.delegate_hashed_bins(list_of_targets, public_keys,
-                            number_of_bins=2, succinct=True, prefix='prefix')
+                            number_of_bins=2, succinct=True, prefix='prefix-')
 
     delegated_rolename = "prefix-"
 

tests/test_tutorial.py

@@ -350,7 +350,7 @@ def test_tutorial(self):
     # of calls or rather its call arguments.
     with mock.patch("tuf.repository_tool.logger") as mock_logger:
       repository.targets('unclaimed').delegate_hashed_bins(
-          targets, [public_unclaimed_key], 32)
+          targets, [public_unclaimed_key], 32, prefix='unclaimed.hbd-')
 
       self.assertListEqual([
             "Creating hashed bin delegations.\n"

tuf/repository_lib.py

@@ -1109,7 +1109,7 @@ def get_bin_numbers(number_of_bins):
 
 
 
-def find_bin_for_target_hash(target_hash, number_of_bins, prefix):
+def find_bin_for_target_hash(target_hash, number_of_bins, name_prefix):
   """
   <Purpose>
     For a given hashed filename, target_hash, calculate the name of a hashed bin
@@ -1123,7 +1123,7 @@ def find_bin_for_target_hash(target_hash, number_of_bins, prefix):
     number_of_bins:
       The number of hashed_bins in use
 
-    prefix:
+    name_prefix:
       The bin name prefix
 
   <Returns>
@@ -1136,7 +1136,7 @@ def find_bin_for_target_hash(target_hash, number_of_bins, prefix):
 
   low = prefix - (prefix % bin_size)
 
-  return "{pre}{num:0{len}x}".format(pre=prefix, num=int(low/bin_size),
+  return "{pre}{num:0{len}x}".format(pre=name_prefix, num=int(low/bin_size),
       len=prefix_length)