2 files changed, 11 insertions, 11 deletions

diff --git a/auto_tests/assoc_test.c b/auto_tests/assoc_test.c
index 9de95136..165724e9 100644
--- a/auto_tests/assoc_test.c
+++ b/auto_tests/assoc_test.c
@@ -18,7 +18,7 @@
 START_TEST(test_basics)
 {
     /* TODO: real test */
-    uint8_t id[CLIENT_ID_SIZE];
+    uint8_t id[crypto_box_PUBLICKEYBYTES];
     Assoc *assoc = new_Assoc_default(id);
     ck_assert_msg(assoc != NULL, "failed to create default assoc");
 
@@ -63,19 +63,19 @@ START_TEST(test_fillup)
 {
     /* TODO: real test */
     int i, j;
-    uint8_t id[CLIENT_ID_SIZE];
+    uint8_t id[crypto_box_PUBLICKEYBYTES];
     //uint32_t a = current_time();
     uint32_t a = 2710106197;
     srand(a);
 
-    for (i = 0; i < CLIENT_ID_SIZE; ++i) {
+    for (i = 0; i < crypto_box_PUBLICKEYBYTES; ++i) {
         id[i] = rand();
     }
 
     Assoc *assoc = new_Assoc(6, 15, id);
     ck_assert_msg(assoc != NULL, "failed to create default assoc");
     struct entry {
-        uint8_t id[CLIENT_ID_SIZE];
+        uint8_t id[crypto_box_PUBLICKEYBYTES];
         IPPTs ippts_send;
         IP_Port ipp_recv;
     };
@@ -85,7 +85,7 @@ START_TEST(test_fillup)
 
     for (j = 0; j < 128; ++j) {
 
-        for (i = 0; i < CLIENT_ID_SIZE; ++i) {
+        for (i = 0; i < crypto_box_PUBLICKEYBYTES; ++i) {
             entries[j].id[i] = rand();
         }
 
@@ -100,7 +100,7 @@ START_TEST(test_fillup)
         entries[j].ipp_recv = ipp;
 
         if (j % 16 == 0) {
-            memcpy(entries[j].id, id, CLIENT_ID_SIZE - 30);
+            memcpy(entries[j].id, id, crypto_box_PUBLICKEYBYTES - 30);
             memcpy(&closest[j / 16], &entries[j], sizeof(struct entry));
 
         }
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 479eb330..32985bca 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -85,7 +85,7 @@ void test_addto_lists_update(DHT            *dht,
 {
     int used, test, test1, test2, found;
     IP_Port test_ipp;
-    uint8_t test_id[CLIENT_ID_SIZE];
+    uint8_t test_id[crypto_box_PUBLICKEYBYTES];
     uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0;
 
     // check id update for existing ip_port
@@ -153,7 +153,7 @@ void test_addto_lists_bad(DHT            *dht,
 {
     // check "bad" clients replacement
     int used, test1, test2, test3;
-    uint8_t public_key[CLIENT_ID_SIZE], test_id1[CLIENT_ID_SIZE], test_id2[CLIENT_ID_SIZE], test_id3[CLIENT_ID_SIZE];
+    uint8_t public_key[crypto_box_PUBLICKEYBYTES], test_id1[crypto_box_PUBLICKEYBYTES], test_id2[crypto_box_PUBLICKEYBYTES], test_id3[crypto_box_PUBLICKEYBYTES];
     uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0;
 
     randombytes(public_key, sizeof(public_key));
@@ -196,7 +196,7 @@ void test_addto_lists_possible_bad(DHT            *dht,
 {
     // check "possibly bad" clients replacement
     int used, test1, test2, test3;
-    uint8_t public_key[CLIENT_ID_SIZE], test_id1[CLIENT_ID_SIZE], test_id2[CLIENT_ID_SIZE], test_id3[CLIENT_ID_SIZE];
+    uint8_t public_key[crypto_box_PUBLICKEYBYTES], test_id1[crypto_box_PUBLICKEYBYTES], test_id2[crypto_box_PUBLICKEYBYTES], test_id3[crypto_box_PUBLICKEYBYTES];
     uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0;
 
     randombytes(public_key, sizeof(public_key));
@@ -258,7 +258,7 @@ void test_addto_lists_good(DHT            *dht,
                            IP_Port        *ip_port,
                            const uint8_t  *comp_client_id)
 {
-    uint8_t public_key[CLIENT_ID_SIZE];
+    uint8_t public_key[crypto_box_PUBLICKEYBYTES];
     uint8_t ipv6 = ip_port->ip.family == AF_INET6 ? 1 : 0;
 
     mark_all_good(list, length, ipv6);
@@ -291,7 +291,7 @@ void test_addto_lists(IP ip)
     ck_assert_msg(dht != 0, "Failed to create DHT");
 
     IP_Port ip_port = { .ip = ip, .port = TOX_PORT_DEFAULT };
-    uint8_t public_key[CLIENT_ID_SIZE];
+    uint8_t public_key[crypto_box_PUBLICKEYBYTES];
     int i, used;
 
     // check lists filling