Refactor AlphabetKet to SubstitutionKey

test/get_hard_coded_json.py

@@ -4,7 +4,7 @@ from src.models import MutualEphemeralDataKeys, MutualEphemeralMediumKeys, Mutua
     MutualPersistentMediumKeys, MutualPersistentDataKeys, MutualPersistentKeys, MutualKeys, ServerEphemeralMediumKeys, \
     ServerEphemeralDataKeys, ServerEphemeralKeys, ServerPersistentMediumKeys, ServerPersistentDataKeys, ServerKeys, \
     ServerPersistentKeys, ClientEphemeralMediumKeys, ClientEphemeralDataKeys, ClientEphemeralKeys, \
-    ClientPersistentMediumKeys, ClientKeys, ClientPersistentKeys, ClientPersistentDataKeys, AlphabetKey
+    ClientPersistentMediumKeys, ClientKeys, ClientPersistentKeys, ClientPersistentDataKeys, SubstitutionKey
 
 
 def keys():
@@ -129,6 +129,6 @@ def keys():
            )
        )
     )
-    alphabet = AlphabetKey(**server_ephemeral_keys["Alphabet"])
+    alphabet = SubstitutionKey(**server_ephemeral_keys["Alphabet"])
 
     return alphabet, server_keys, mutual_keys, client_keys

test/test_darc.py

@@ -1,7 +1,7 @@
 from src.client_darc_noclient import merge_message_no_client, darc_phase_2_3
 from src.client_darc import merge_message, darc_phase2, darc_phase3
 from src.key_generation import generate_keys
-from src.models import AlphabetKey, OuterKey
+from src.models import SubstitutionKey, OuterKey
 from src.server_darc import darc_phase1, darc_phase_4, resolve_message
 import pytest
 
@@ -11,8 +11,8 @@ import pytest
     [(256, 10, 256), (100, 70, 70), (40, 50, 40), (256, 10, 128), (100, 70, 35), (40, 50, 20)]
 )
 def test_darc(height, width, message_len):
-    alphabet = AlphabetKey.init_matrix(width, height, 255)
-    medium = AlphabetKey(matrix=[[0 for _ in range(width)] for _ in range(height)])
+    alphabet = SubstitutionKey.init_matrix(width, height, 255)
+    medium = SubstitutionKey(matrix=[[0 for _ in range(width)] for _ in range(height)])
 
     server_keys, mutual_keys, client_keys = generate_keys(height, width)
     original_message = OuterKey.init_matrix(height).matrix[0]
@@ -35,8 +35,8 @@ def test_darc(height, width, message_len):
     [(256, 10, 256), (100, 70, 70), (40, 50, 40), (256, 10, 128), (100, 70, 35), (40, 50, 20)]
 )
 def test_darc_no_client(height, width, message_len):
-    alphabet = AlphabetKey.init_matrix(width, height, 255)
-    medium = AlphabetKey(matrix=[[0 for _ in range(width)] for _ in range(height)])
+    alphabet = SubstitutionKey.init_matrix(width, height, 255)
+    medium = SubstitutionKey(matrix=[[0 for _ in range(width)] for _ in range(height)])
 
     server_keys, mutual_keys, client_keys = generate_keys(height, width)