rename functions and attributes

test/test_nkode_api.py

@@ -1,5 +1,6 @@
 import pytest
 from nkode_api import NKodeAPI
+from src.models import NKodePolicy
 
 
 @pytest.fixture()
@@ -7,41 +8,42 @@ def nkode_api() -> NKodeAPI:
     return NKodeAPI()
 
 
-@pytest.mark.parametrize("numb_keys,attrs_per_key,user_passcode", [
+@pytest.mark.parametrize("numb_of_keys,attrs_per_key,user_passcode", [
     (10, 7, [3, 10, 27, 68]),
 ])
-def test_create_new_user_and_renew_keys(nkode_api, numb_keys, attrs_per_key, user_passcode):
+def test_create_new_user_and_renew_keys(nkode_api, numb_of_keys, attrs_per_key, user_passcode):
     username = "test_username"
-    customer = nkode_api.create_new_customer(numb_keys, attrs_per_key)
-    session_id, set_interface = nkode_api.generate_index_interface(customer.customer_id)
+    nkode_policy = NKodePolicy()  # default policy
+    customer_id = nkode_api.create_new_customer(numb_of_keys, attrs_per_key, nkode_policy)
+    session_id, set_interface = nkode_api.generate_index_interface(customer_id)
 
     key_selection = lambda interface: [interface.index(attr) // attrs_per_key for attr in user_passcode]
     set_key_selection = key_selection(set_interface)
 
-    confirm_interface = nkode_api.set_nkode(username, customer.customer_id, set_key_selection, session_id)
+    confirm_interface = nkode_api.set_nkode(username, customer_id, set_key_selection, session_id)
     confirm_key_selection = key_selection(confirm_interface)
-    response = nkode_api.confirm_nkode(
+    successful_confirm = nkode_api.confirm_nkode(
         username,
-        customer.customer_id,
+        customer_id,
         confirm_key_selection,
         session_id
     )
-    assert ("success" == response)
+    assert successful_confirm
 
-    login_interface = nkode_api.get_login_index_interface(username, customer.customer_id)
+    login_interface = nkode_api.get_login_index_interface(username, customer_id)
     login_key_selection = key_selection(login_interface)
-    successful_login = nkode_api.login(customer.customer_id, username, login_key_selection)
+    successful_login = nkode_api.login(customer_id, username, login_key_selection)
     assert successful_login
 
-    successful_renew = nkode_api.renew_keys(customer.customer_id)
+    successful_renew = nkode_api.renew_keys(customer_id)
     assert successful_renew
 
-    login_interface = nkode_api.get_login_index_interface(username, customer.customer_id)
+    login_interface = nkode_api.get_login_index_interface(username, customer_id)
     login_key_selection = key_selection(login_interface)
-    successful_login = nkode_api.login(customer.customer_id, username, login_key_selection)
+    successful_login = nkode_api.login(customer_id, username, login_key_selection)
     assert successful_login
 
-    login_interface = nkode_api.get_login_index_interface(username, customer.customer_id)
+    login_interface = nkode_api.get_login_index_interface(username, customer_id)
     login_key_selection = key_selection(login_interface)
-    successful_login = nkode_api.login(customer.customer_id, username, login_key_selection)
+    successful_login = nkode_api.login(customer_id, username, login_key_selection)
     assert successful_login

test/test_nkode_interface.py

@@ -1,14 +1,13 @@
 import pytest
-from src.customer_interface import CustomerInterface
 from src.user_interface import UserInterface
 
+
 @pytest.mark.parametrize(
-    "numb_keys,attrs_per_key",
-    [(10, 7, )]
+    "numb_of_keys,attrs_per_key",
+    [(10, 7,)]
 )
-def test_attr_set_idx(numb_keys, attrs_per_key):
-    user_interface = UserInterface.new_interface(attrs_per_key, numb_keys)
-    customer_interface = CustomerInterface.new_interface(numb_keys, attrs_per_key)
+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]
 

test/test_user_cipher_keys.py

@@ -22,11 +22,11 @@ def test_encode_decode_base64(passcode_len):
         (10, 7,)
     ])
 def test_decode_mask(numb_of_keys, attrs_per_key):
-    customer = CustomerInterface.new_interface(numb_of_keys, attrs_per_key)
+    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_values = [customer.customer_interface[idx] for idx in passcode_entry]
+    passcode_values = [customer.attr_vals[idx] for idx in passcode_entry]
     set_vals = customer.set_vals
-    user_keys = UserCipherKeys.new_user_encipher_keys(numb_of_keys, attrs_per_key, set_vals)
+    user_keys = UserCipherKeys.new(numb_of_keys, attrs_per_key, set_vals)
     passcode = user_keys.encipher_nkode(passcode_entry, customer)
 
     orig_passcode_set_vals = [customer.get_attr_set_val(attr) for attr in passcode_values]

test/test_user_interface.py

@@ -4,7 +4,7 @@ from src.user_interface import UserInterface
 
 @pytest.fixture()
 def user_interface():
-    return UserInterface.new_interface(7, 10)
+    return UserInterface.new(7, 10)
 
 
 def test_dispersion(user_interface):