-not sure I see how this test can work, disabling for now

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

diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c
index 0673243b6b6406b6089df09f6d2c83254c6f14ef..dbeef3f656489ba84607e26e1d980a0c814bee00 100644 (file)
--- a/src/gns/test_gns_ns_lookup.c
+++ b/src/gns/test_gns_ns_lookup.c
@@ -17,6 +17,8 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
+
+
 /**
  * @file gns/test_gns_ns_lookup.c
  * @brief base testcase for testing a local GNS record lookup through NS
@@ -38,25 +40,25 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /**
- * Name to resolve for testing.  NS record on 'homepage.gads' redirects to
+ * Name to resolve for testing.  NS record on 'homepage.gnu' redirects to
  * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
  * that target domain.
  */
-#define TEST_DOMAIN "www.homepage.gads"
+#define TEST_DOMAIN "www.homepage.gnu"
 
 /**
- * Name to resolve for testing.  NS record on 'homepage.gads' redirects to
+ * Name to resolve for testing.  NS record on 'homepage.gnu' redirects to
  * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
  * that target domain.
  */
-#define TEST_DOMAIN_ALT "homepage.gads"
+#define TEST_DOMAIN_ALT "homepage.gnu"
 
 /**
- * Name to resolve for testing.  NS record on 'homepage.gads' redirects to
+ * Name to resolve for testing.  NS record on 'homepage.gnu' redirects to
  * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
  * that target domain.
  */
-#define TEST_DOMAIN_ALT2 "uk.homepage.gads"
+#define TEST_DOMAIN_ALT2 "uk.homepage.gnu"
 
 /**
  * Expected test value (matching TEST_DOMAIN_ALT2).
@@ -174,7 +176,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   if (NULL != alice_key)
   {
-    GNUNET_CRYPTO_ecc_key_free (alice_key);
+    GNUNET_free (alice_key);
     alice_key = NULL;
   }
   GNUNET_break (0);
@@ -229,7 +231,7 @@ end_now (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   if (NULL != alice_key)
   {
-    GNUNET_CRYPTO_ecc_key_free (alice_key);
+    GNUNET_free (alice_key);
     alice_key = NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
@@ -267,7 +269,7 @@ on_lookup_result_alt2 (void *cls, uint32_t rd_count,
   ok = 1;
   for (i=0; i<rd_count; i++)
   {
-    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);
@@ -335,7 +337,7 @@ on_lookup_result_alt (void *cls, uint32_t rd_count,
   ok = 1;
   for (i=0; i<rd_count; i++)
   {
-    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);
@@ -366,7 +368,7 @@ on_lookup_result_alt (void *cls, uint32_t rd_count,
              "Starting lookup for `%s'\n",
              TEST_DOMAIN_ALT2);
   lr = GNUNET_GNS_lookup (gns_handle, 
-                         TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_A,
+                         TEST_DOMAIN_ALT2, GNUNET_DNSPARSER_TYPE_A,
                          GNUNET_YES,
                          NULL,
                          &on_lookup_result_alt2, NULL);
@@ -407,7 +409,7 @@ on_lookup_result (void *cls, uint32_t rd_count,
   ok = 1;
   for (i=0; i<rd_count; i++)
   {
-    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);
@@ -438,7 +440,7 @@ on_lookup_result (void *cls, uint32_t rd_count,
              "Starting lookup for `%s'\n",
              TEST_DOMAIN_ALT);
 
-  lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_A,
+  lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ALT, GNUNET_DNSPARSER_TYPE_A,
                          GNUNET_YES,
                          NULL,
                          &on_lookup_result_alt, NULL);
@@ -462,7 +464,7 @@ start_lookup ()
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
              "Records ready, starting lookup for `%s'\n",
              TEST_DOMAIN);
-  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_YES,
                          NULL,
                          &on_lookup_result, NULL);
@@ -561,7 +563,7 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey;
   char* alice_keyfile;
   struct GNUNET_NAMESTORE_RecordData rd[2];
   struct in_addr ns;
@@ -591,7 +593,7 @@ do_check (void *cls,
   }
 
   alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile);
-  GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey);
   GNUNET_free (alice_keyfile);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -601,13 +603,13 @@ do_check (void *cls,
   rd[0].data_size = sizeof (struct in_addr);
   rd[0].data = &ns;
   rd[0].record_type = GNUNET_DNSPARSER_TYPE_A;
-  rd[0].flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+  rd[0].flags = GNUNET_NAMESTORE_RF_NONE;
   
   rd[1].expiration_time = UINT64_MAX;
   rd[1].data_size = strlen (TEST_RECORD_NS);
   rd[1].data = TEST_RECORD_NS;
-  rd[1].record_type = GNUNET_GNS_RECORD_NS;
-  rd[1].flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+  rd[1].record_type = GNUNET_DNSPARSER_TYPE_NS;
+  rd[1].flags = GNUNET_NAMESTORE_RF_NONE;
 
   qe = GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                                 alice_key,