-fixing #2985

[oweals/gnunet.git] / src / gns / test_gns_max_queries.c

diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c
index 82273798ff06f54116a61885c8537f205efe941b..131d8cf8685e2fe22333cc72757ac38591036d2f 100644 (file)
--- a/src/gns/test_gns_max_queries.c
+++ b/src/gns/test_gns_max_queries.c
@@ -37,8 +37,8 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.gads"
-#define TEST_DOMAIN_NACK "doesnotexist.bob.gads"
+#define TEST_DOMAIN "www.gnu"
+#define TEST_DOMAIN_NACK "doesnotexist.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 #define TEST_ADDITIONAL_LOOKUPS 5
@@ -182,7 +182,7 @@ on_lookup_result (void *cls, uint32_t rd_count,
     for (i=0; i<rd_count; i++)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
       {
         memcpy(&a, rd[i].data, sizeof(a));
         addr = inet_ntoa(a);
@@ -230,14 +230,14 @@ commence_testing (void *cls, int32_t success, const char *emsg)
   {
     GNUNET_snprintf(lookup_name,
                     GNUNET_DNSPARSER_MAX_NAME_LENGTH,
-                    "www.doesnotexist-%d.bob.gads", i);
-    lr = GNUNET_GNS_lookup (gns_handle, lookup_name, GNUNET_GNS_RECORD_A,
+                    "www.doesnotexist-%d.bob.gnu", i);
+    lr = GNUNET_GNS_lookup (gns_handle, lookup_name, GNUNET_DNSPARSER_TYPE_A,
                            GNUNET_NO,
                            NULL,
                            &on_lookup_result_dummy, &requests[num_requests]);
     requests[num_requests++] = lr;
   }
-  lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+  lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_A,
                          GNUNET_NO,
                          NULL,
                          &on_lookup_result, TEST_DOMAIN);
@@ -252,8 +252,8 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded bob_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   char* alice_keyfile;
@@ -320,7 +320,7 @@ do_check (void *cls,
   GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
-  rd.record_type = GNUNET_GNS_RECORD_PKEY;
+  rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                            alice_key,