rename functions and attributes

test/test_nkode_interface.py

@@ -9,6 +9,6 @@ from src.user_interface import UserInterface
 def test_attr_set_idx(numb_of_keys, attrs_per_key):
     user_interface = UserInterface.new(attrs_per_key, numb_of_keys)
     for attr_idx in range(70):
-        user_interface_idx = user_interface.interface_index[attr_idx]
+        user_interface_idx = user_interface.attr_indices[attr_idx]
 
         assert (attr_idx % attrs_per_key == user_interface_idx % attrs_per_key)

test/test_user_cipher_keys.py

@@ -16,20 +16,21 @@ def test_encode_decode_base64(passcode_len):
     assert (len(data) == len(decoded))
     assert (all(data[idx] == decoded[idx] for idx in range(passcode_len)))
 
+
 @pytest.mark.parametrize(
-    "numb_of_keys,attrs_per_key",
+    "numb_of_keys,attrs_per_key,max_nkode_len",
     [
-        (10, 7,)
+        (10, 7,10)
     ])
-def test_decode_mask(numb_of_keys, attrs_per_key):
+def test_decode_mask(numb_of_keys, attrs_per_key, max_nkode_len):
     customer = CustomerInterface.new(numb_of_keys, attrs_per_key)
-    passcode_entry = generate_random_nonrepeating_list(numb_of_keys*attrs_per_key, max_val=70)[:4]
+    passcode_entry = generate_random_nonrepeating_list(numb_of_keys * attrs_per_key, max_val=70)[:4]
     passcode_values = [customer.attr_vals[idx] for idx in passcode_entry]
     set_vals = customer.set_vals
-    user_keys = UserCipherKeys.new(numb_of_keys, attrs_per_key, set_vals)
+    user_keys = UserCipherKeys.new(numb_of_keys, attrs_per_key, set_vals, max_nkode_len)
     passcode = user_keys.encipher_nkode(passcode_entry, customer)
 
     orig_passcode_set_vals = [customer.get_attr_set_val(attr) for attr in passcode_values]
     passcode_set_vals = user_keys.decipher_mask(passcode.mask, set_vals, len(passcode_entry))
-    assert(len(passcode_set_vals) == len(orig_passcode_set_vals))
-    assert(all(orig_passcode_set_vals[idx] == passcode_set_vals[idx] for idx in range(len(passcode_set_vals))))
+    assert (len(passcode_set_vals) == len(orig_passcode_set_vals))
+    assert (all(orig_passcode_set_vals[idx] == passcode_set_vals[idx] for idx in range(len(passcode_set_vals))))

test/test_user_interface.py

@@ -24,9 +24,9 @@ def test_shuffle_attrs(user_interface):
     - every attribute is adjacent to every other attribute with uniform distribution
     - the order in which the attributes move from key to key is random (i.e. the distance traveled is uniform)
     """
-    pre_shuffle_interface = user_interface.interface_index
+    pre_shuffle_interface = user_interface.attr_indices
     user_interface.shuffle_interface()
-    post_shuffle_interface = user_interface.interface_index
+    post_shuffle_interface = user_interface.attr_indices
     for i in range(1000):
         assert (not all(
             post_shuffle_interface[idx] == pre_shuffle_interface[idx] for idx in range(len(post_shuffle_interface))