SAE progress

Author: brunorijsman

system_tests/test_psrd_usage.py

@@ -111,7 +111,7 @@ def test_psrd_usage_one_small_key():
     # Get a small key (consume only PSRD from first block)
     key_size_in_bytes = 10
     key_size_in_bits = key_size_in_bytes * 8
-    system_test_common.get_key_pair("sammy", "sofia", size=key_size_in_bits)
+    system_test_common.get_key_pair("sam", "sofia", size=key_size_in_bits)
 
     # Check PSRD consumption on master client carol
     sign_size = SIGNING_KEY_SIZE
@@ -124,7 +124,7 @@ def test_psrd_usage_one_small_key():
     _check_client_psrd_consumption("connie", "*", "peer", [sign_and_encrypt_size])
 
     # Check PSRD consumption on each hub
-    for client in ["celia", "connie", "curtis"]:
+    for client in ["celia", "cindy", "curtis"]:
         _check_hub_psrd_consumption("*", client, "*", [0])
     _check_hub_psrd_consumption("*", "carol", "local", [sign_size])
     _check_hub_psrd_consumption("*", "carol", "peer", [sign_and_encrypt_size])
@@ -144,30 +144,30 @@ def test_psrd_usage_two_small_keys():
     # Get two small keys (consume only PSRD from first block)
     key_1_size_in_bytes = 10
     key_1_size_in_bits = key_1_size_in_bytes * 8
-    system_test_common.get_key_pair("carol", "cindy", size=key_1_size_in_bits)
+    system_test_common.get_key_pair("serena", "sunny", size=key_1_size_in_bits)
     key_2_size_in_bytes = 15
     key_2_size_in_bits = key_2_size_in_bytes * 8
-    system_test_common.get_key_pair("carol", "cindy", size=key_2_size_in_bits)
+    system_test_common.get_key_pair("serena", "sunny", size=key_2_size_in_bits)
 
     # Check PSRD consumption on master client Carol
     sign_size = 2 * SIGNING_KEY_SIZE
     sign_and_encrypt_size = (
         2 * SIGNING_KEY_SIZE + key_1_size_in_bytes + key_2_size_in_bytes
     )
-    _check_client_psrd_consumption("carol", "*", "local", [sign_and_encrypt_size])
-    _check_client_psrd_consumption("carol", "*", "peer", [sign_size])
+    _check_client_psrd_consumption("celia", "*", "local", [sign_and_encrypt_size])
+    _check_client_psrd_consumption("celia", "*", "peer", [sign_size])
 
     # Check PSRD consumption on slave client Cindy
-    _check_client_psrd_consumption("cindy", "*", "local", [sign_size])
-    _check_client_psrd_consumption("cindy", "*", "peer", [sign_and_encrypt_size])
+    _check_client_psrd_consumption("curtis", "*", "local", [sign_size])
+    _check_client_psrd_consumption("curtis", "*", "peer", [sign_and_encrypt_size])
 
     # Check PSRD consumption on each hub
-    for client in ["celia", "connie", "curtis"]:
+    for client in ["carol", "cindy", "connie"]:
         _check_hub_psrd_consumption("*", client, "*", [0])
-    _check_hub_psrd_consumption("*", "carol", "local", [sign_size])
-    _check_hub_psrd_consumption("*", "carol", "peer", [sign_and_encrypt_size])
-    _check_hub_psrd_consumption("*", "cindy", "local", [sign_and_encrypt_size])
-    _check_hub_psrd_consumption("*", "cindy", "peer", [sign_size])
+    _check_hub_psrd_consumption("*", "celia", "local", [sign_size])
+    _check_hub_psrd_consumption("*", "celia", "peer", [sign_and_encrypt_size])
+    _check_hub_psrd_consumption("*", "curtis", "local", [sign_and_encrypt_size])
+    _check_hub_psrd_consumption("*", "curtis", "peer", [sign_size])
 
 
 def test_psrd_usage_refresh():
@@ -185,7 +185,7 @@ def test_psrd_usage_refresh():
     # Get a large key (triggering PSRD refresh)
     key_size_in_bytes = 1600
     key_size_in_bits = key_size_in_bytes * 8
-    system_test_common.get_key_pair("carol", "cindy", size=key_size_in_bits)
+    system_test_common.get_key_pair("susan", "sofia", size=key_size_in_bits)
 
     # Giver refresh time to complete
     sleep(1.0)
@@ -195,17 +195,17 @@ def test_psrd_usage_refresh():
     sign_and_encrypt_size = SIGNING_KEY_SIZE + key_size_in_bytes
     assert sign_size < START_REQUEST_PSRD_THRESHOLD
     assert sign_and_encrypt_size > START_REQUEST_PSRD_THRESHOLD
-    _check_client_psrd_consumption("carol", "*", "local", [sign_and_encrypt_size, 0])
-    _check_client_psrd_consumption("carol", "*", "peer", [sign_size])
+    _check_client_psrd_consumption("curtis", "*", "local", [sign_and_encrypt_size, 0])
+    _check_client_psrd_consumption("curtis", "*", "peer", [sign_size])
 
     # Check PSRD consumption on slave client Cindy
-    _check_client_psrd_consumption("cindy", "*", "local", [sign_size])
-    _check_client_psrd_consumption("cindy", "*", "peer", [sign_and_encrypt_size, 0])
+    _check_client_psrd_consumption("connie", "*", "local", [sign_size])
+    _check_client_psrd_consumption("connie", "*", "peer", [sign_and_encrypt_size, 0])
 
     # Check PSRD consumption on each hub
-    for client in ["celia", "connie", "curtis"]:
+    for client in ["celia", "celia", "cindy"]:
         _check_hub_psrd_consumption("*", client, "*", [0])
-    _check_hub_psrd_consumption("*", "carol", "local", [sign_size])
-    _check_hub_psrd_consumption("*", "carol", "peer", [sign_and_encrypt_size, 0])
-    _check_hub_psrd_consumption("*", "cindy", "local", [sign_and_encrypt_size, 0])
-    _check_hub_psrd_consumption("*", "cindy", "peer", [sign_size])
+    _check_hub_psrd_consumption("*", "curtis", "local", [sign_size])
+    _check_hub_psrd_consumption("*", "curtis", "peer", [sign_and_encrypt_size, 0])
+    _check_hub_psrd_consumption("*", "connie", "local", [sign_and_encrypt_size, 0])
+    _check_hub_psrd_consumption("*", "connie", "peer", [sign_size])