-fixing #2985

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

diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c
index 812a157dbd2027378a0c680b9b63e31765414098..7b57aeb6c9aa4fb8a6db923fba62d6542081b9fd 100644 (file)
--- a/src/gns/test_gns_simple_mx_lookup.c
+++ b/src/gns/test_gns_simple_mx_lookup.c
@@ -23,7 +23,7 @@
  *
  */
 #include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"
@@ -36,11 +36,11 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "bob.gads"
+#define TEST_DOMAIN "bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "mail"
 #define TEST_MX_NAME "mail.+"
-#define TEST_EXPECTED_MX "mail.bob.gads"
+#define TEST_EXPECTED_MX "mail.bob.gnu"
 
 #define TEST_AUTHORITY_NAME "bob"
 
@@ -131,7 +131,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_MX)
+      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_MX)
       {
         mx = (char*)rd[i].data+sizeof(uint16_t);
         mx_preference = *(uint16_t*)rd[i].data;
@@ -168,7 +168,7 @@ commence_testing (void *cls, int32_t success, const char *emsg)
     end_badly_now();
     return;
   }
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_MX,
+  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_MX,
                     GNUNET_NO,
                     NULL,
                     &on_lookup_result, TEST_DOMAIN);
@@ -180,12 +180,12 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
-  struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
+  struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
+  struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-  struct GNUNET_CRYPTO_RsaSignature *sig;
+  struct GNUNET_CRYPTO_EccSignature *sig;
   char* alice_keyfile;
   struct GNUNET_TIME_Absolute et;
 
@@ -210,11 +210,11 @@ do_check (void *cls,
     return;
   }
 
-  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
-  bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
+  alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile);
+  bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB);
 
-  GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
-  GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey);
+  GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey);
 
   struct GNUNET_NAMESTORE_RecordData rd;
   char* ip = TEST_IP;
@@ -228,15 +228,15 @@ do_check (void *cls,
 
   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;
   rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
 
-  GNUNET_NAMESTORE_record_create (namestore_handle,
-                                  alice_key,
-                                  TEST_AUTHORITY_NAME,
-                                  &rd,
-                                  NULL,
-                                  NULL);
+  GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
+                                           alice_key,
+                                           TEST_AUTHORITY_NAME,
+                                           1, &rd,
+                                           NULL,
+                                           NULL);
 
   rd.data_size = sizeof(struct in_addr);
   rd.data = mail;
@@ -245,7 +245,7 @@ do_check (void *cls,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
                                           TEST_RECORD_NAME,
                                           &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                TEST_RECORD_NAME,
@@ -262,15 +262,15 @@ do_check (void *cls,
   memcpy(mx_record, &mx_preference, sizeof(uint16_t));
   strcpy(mx_record+sizeof(uint16_t), TEST_MX_NAME);
   rd.data = mx_record;
-  rd.record_type = GNUNET_GNS_RECORD_MX;
+  rd.record_type = GNUNET_DNSPARSER_TYPE_MX;
   sig = GNUNET_NAMESTORE_create_signature(bob_key,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          "+",
+                                          GNUNET_GNS_MASTERZONE_STR,
                                           &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
-                               "+",
+                               GNUNET_GNS_MASTERZONE_STR,
                                et,
                                1,
                                &rd,
@@ -282,8 +282,8 @@ do_check (void *cls,
   GNUNET_free (mx_record);
   GNUNET_free (mail);
   GNUNET_free (sig);
-  GNUNET_CRYPTO_rsa_key_free (bob_key);
-  GNUNET_CRYPTO_rsa_key_free (alice_key);
+  GNUNET_CRYPTO_ecc_key_free (bob_key);
+  GNUNET_CRYPTO_ecc_key_free (alice_key);
 }