More fixes for #3522

[oweals/gnunet.git] / src / namestore / test_namestore_api_monitoring_existing.c

diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
index 3958e4d6c5302148c675c7bbee1cf84ec70c1807..5d376a6340afd640623c65f86d7a99dceeed8457 100644 (file)
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -35,9 +35,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
 
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
 
 static struct GNUNET_NAMESTORE_ZoneMonitor *zm;
 
@@ -45,18 +45,19 @@ static int res;
 
 static char * s_name_1;
 
-static struct GNUNET_NAMESTORE_RecordData *s_rd_1;
+static struct GNUNET_GNSRECORD_Data *s_rd_1;
 
 static char * s_name_2;
 
-static struct GNUNET_NAMESTORE_RecordData *s_rd_2;
+static struct GNUNET_GNSRECORD_Data *s_rd_2;
 
 static char * s_name_3;
 
-static struct GNUNET_NAMESTORE_RecordData *s_rd_3;
+static struct GNUNET_GNSRECORD_Data *s_rd_3;
 
 struct GNUNET_NAMESTORE_QueueEntry * ns_ops[3];
 
+static char *directory;
 
 static void
 do_shutdown ()
@@ -146,18 +147,18 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-          const struct GNUNET_CRYPTO_EccPrivateKey *zone_key,
+          const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
           const char *name,
           unsigned int rd_count,
-          const struct GNUNET_NAMESTORE_RecordData *rd)
+          const struct GNUNET_GNSRECORD_Data *rd)
 {
        static int returned_records;
        static int fail = GNUNET_NO;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Comparing results name %s\n", 
+             "Comparing results name %s\n",
              name);
 
-  if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey)))
+  if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Monitoring returned wrong zone key\n");
@@ -169,7 +170,7 @@ zone_proc (void *cls,
 
   if (0 == strcmp (name, s_name_1))
   {
-    if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
+    if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
     {
       GNUNET_break (0);
        fail = GNUNET_YES;
@@ -177,7 +178,7 @@ zone_proc (void *cls,
   }
   else if (0 == strcmp (name, s_name_2))
   {
-    if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
+    if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
     {
       GNUNET_break (0);
        fail = GNUNET_YES;
@@ -192,7 +193,7 @@ zone_proc (void *cls,
   }
 
   if (2 == ++returned_records)
-  {  
+  {
     if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
     {
       GNUNET_SCHEDULER_cancel (endbadly_task);
@@ -237,10 +238,11 @@ put_cont (void *cls, int32_t success, const char *emsg)
   {
     /* Start monitoring */
     zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
-                                               privkey,
-                                           &zone_proc,
-                                           NULL,
-                                           NULL);
+                                              privkey,
+                                              GNUNET_YES,
+                                              &zone_proc,
+                                              NULL,
+                                              NULL);
     if (NULL == zm)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone monitor\n");
@@ -252,19 +254,20 @@ put_cont (void *cls, int32_t success, const char *emsg)
 }
 
 
-static struct GNUNET_NAMESTORE_RecordData *
+static struct GNUNET_GNSRECORD_Data *
 create_record (unsigned int count)
 {
   unsigned int c;
-  struct GNUNET_NAMESTORE_RecordData * rd;
+  struct GNUNET_GNSRECORD_Data * rd;
 
-  rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+  rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data));
   for (c = 0; c < count; c++)
   {
     rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us;
     rd[c].record_type = 1111;
     rd[c].data_size = 50;
     rd[c].data = GNUNET_malloc(50);
+    rd[c].flags = 0;
     memset ((char *) rd[c].data, 'a', 50);
   }
   return rd;
@@ -272,21 +275,25 @@ create_record (unsigned int count)
 
 
 static void
-run (void *cls, 
+run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *mycfg,
      struct GNUNET_TESTING_Peer *peer)
 {
   char *hostkey_file;
 
+  directory = NULL;
+  GNUNET_CONFIGURATION_get_value_string(mycfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+  GNUNET_DISK_directory_remove (directory);
+
   res = 1;
 
   GNUNET_asprintf(&hostkey_file,
                  "zonefiles%s%s",
                  DIR_SEPARATOR_STR,
                  "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Using zonekey file `%s' \n", hostkey_file);
-  privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
 
@@ -306,7 +313,7 @@ run (void *cls,
                  DIR_SEPARATOR_STR,
                  "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
-  privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey2 != NULL);
 
@@ -339,13 +346,19 @@ int
 main (int argc, char *argv[])
 {
   res = 1;
-  if (0 != 
-      GNUNET_TESTING_service_run ("test-namestore-api-monitoring",
-                                 "namestore",
-                                 "test_namestore_api.conf",
-                                 &run,
-                                 NULL))
-    return 1;
+  if (0 !=
+      GNUNET_TESTING_peer_run ("test-namestore-api-monitoring",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   return res;
 }