-fixed _clear() in peers "helper"
[oweals/gnunet.git] / src / namestore / test_namestore_api_zone_iteration_stop.c
index 36a08d7db3cc14d242f1ba06ca8137252188f9a6..8e8f68cfbbe2be52b6b0f14b5125cf3d48f279d3 100644 (file)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file namestore/test_namestore_api_zone_iteration.c
- * @brief testcase for zone iteration functionality: iterate of a specific zone
+ * @brief testcase for zone iteration functionality: stop iterating of zones
  */
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_namestore_service.h"
+#include "gnunet_testing_lib.h"
 #include "namestore.h"
 
-#define VERBOSE GNUNET_NO
 
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
+#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
 
 static struct GNUNET_NAMESTORE_Handle * nsh;
 
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
-static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task;
-static struct GNUNET_OS_Process *arm;
+static struct GNUNET_SCHEDULER_Task * endbadly_task;
 
-static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
-static GNUNET_HashCode zone;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_RsaPrivateKey * privkey2;
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey2;
-static GNUNET_HashCode zone2;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
 
 static struct GNUNET_NAMESTORE_ZoneIterator *zi;
+
 static int res;
+
 static int returned_records;
 
-struct GNUNET_CRYPTO_RsaSignature *sig_1;
-char * s_name_1;
-struct GNUNET_NAMESTORE_RecordData *s_rd_1;
+static char * s_name_1;
 
-struct GNUNET_CRYPTO_RsaSignature *sig_2;
-char * s_name_2;
-struct GNUNET_NAMESTORE_RecordData *s_rd_2;
+static struct GNUNET_GNSRECORD_Data *s_rd_1;
 
-struct GNUNET_CRYPTO_RsaSignature *sig_3;
-char * s_name_3;
-struct GNUNET_NAMESTORE_RecordData *s_rd_3;
+static char * s_name_2;
 
-static void
-start_arm (const char *cfgname)
-{
-  arm = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
-                               "gnunet-service-arm", "-c", cfgname,
-#if VERBOSE_PEERS
-                               "-L", "DEBUG",
-#else
-                               "-L", "ERROR",
-#endif
-                               NULL);
-}
+static struct GNUNET_GNSRECORD_Data *s_rd_2;
+
+static char * s_name_3;
+
+static struct GNUNET_GNSRECORD_Data *s_rd_3;
+
+static char *directory;
 
-static void
-stop_arm ()
-{
-  if (NULL != arm)
-  {
-    if (0 != GNUNET_OS_process_kill (arm, SIGTERM))
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-    GNUNET_OS_process_wait (arm);
-    GNUNET_OS_process_close (arm);
-    arm = NULL;
-  }
-}
 
 /**
  * Re-establish the connection to the service.
@@ -95,19 +68,16 @@ stop_arm ()
 static void
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (stopiteration_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (stopiteration_task);
-    stopiteration_task = GNUNET_SCHEDULER_NO_TASK;
-  }
+       if (NULL != zi)
+       {
+               GNUNET_NAMESTORE_zone_iteration_stop (zi);
+               zi = NULL;
+       }
 
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 
-  GNUNET_free_non_null(sig_1);
-  GNUNET_free_non_null(sig_2);
-  GNUNET_free_non_null(sig_3);
   GNUNET_free_non_null(s_name_1);
   GNUNET_free_non_null(s_name_2);
   GNUNET_free_non_null(s_name_3);
@@ -129,16 +99,12 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
 
   if (privkey != NULL)
-    GNUNET_CRYPTO_rsa_key_free (privkey);
+    GNUNET_free (privkey);
   privkey = NULL;
 
   if (privkey2 != NULL)
-    GNUNET_CRYPTO_rsa_key_free (privkey2);
+    GNUNET_free (privkey2);
   privkey2 = NULL;
-
-  if (NULL != arm)
-    stop_arm();
-
   res = 1;
 }
 
@@ -146,29 +112,26 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (stopiteration_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (stopiteration_task);
-    stopiteration_task = GNUNET_SCHEDULER_NO_TASK;
-  }
+  if (NULL != zi)
+    {
+      GNUNET_NAMESTORE_zone_iteration_stop (zi);
+      zi = NULL;
+    }
 
-  if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+  if (endbadly_task != NULL)
   {
     GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+    endbadly_task = NULL;
   }
 
   if (privkey != NULL)
-    GNUNET_CRYPTO_rsa_key_free (privkey);
+    GNUNET_free (privkey);
   privkey = NULL;
 
   if (privkey2 != NULL)
-    GNUNET_CRYPTO_rsa_key_free (privkey2);
+    GNUNET_free (privkey2);
   privkey2 = NULL;
 
-  GNUNET_free (sig_1);
-  GNUNET_free (sig_2);
-  GNUNET_free (sig_3);
   GNUNET_free (s_name_1);
   GNUNET_free (s_name_2);
   GNUNET_free (s_name_3);
@@ -187,49 +150,42 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_free ((void *)s_rd_3->data);
     GNUNET_free (s_rd_3);
   }
-
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
-
-  if (NULL != arm)
-    stop_arm();
-  if (returned_records == 1)
-    res = 0;
-  else
-    res = 1;
-
 }
 
-void zone_proc (void *cls,
-                const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
-                struct GNUNET_TIME_Absolute expire,
-                const char *name,
-                unsigned int rd_count,
-                const struct GNUNET_NAMESTORE_RecordData *rd,
-                const struct GNUNET_CRYPTO_RsaSignature *signature)
+
+static void
+zone_proc (void *cls,
+           const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+           const char *label,
+           unsigned int rd_count,
+           const struct GNUNET_GNSRECORD_Data *rd)
 {
   int failed = GNUNET_NO;
-
-  if ((zone_key == NULL) &&  (name == NULL))
+  if ((zone == NULL) && (label == NULL))
   {
-    GNUNET_break (3 == returned_records);
-    if (3 == returned_records)
-      res = 0;
+    GNUNET_break (1 <= returned_records);
+    if (1 >= returned_records)
+       res = 1; /* Last iteraterator callback, we are done */
     else
-      res = 1;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done after receing %u results\n",returned_records );
+      res = 0;
+    zi = NULL;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Received last result, iteration done after receing %u results\n",
+               returned_records );
     GNUNET_SCHEDULER_add_now (&end, NULL);
+    return;
   }
-  else
+  GNUNET_assert (NULL != zone);
+  if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing results name %s \n", name);
-    if (0 == strcmp (name, s_name_1))
+    if (0 == strcmp (label, s_name_1))
     {
       if (rd_count == 1)
       {
-        if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
+        if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
         {
           failed = GNUNET_YES;
           GNUNET_break (0);
@@ -240,17 +196,12 @@ void zone_proc (void *cls,
         failed = GNUNET_YES;
         GNUNET_break (0);
       }
-      if (0 != memcmp (signature, sig_1, sizeof (struct GNUNET_CRYPTO_RsaSignature)))
-      {
-        failed = GNUNET_YES;
-        GNUNET_break (0);
-      }
     }
-    else if (0 == strcmp (name, s_name_2))
+    else if (0 == strcmp (label, s_name_2))
     {
       if (rd_count == 1)
       {
-        if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
+        if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
         {
           failed = GNUNET_YES;
           GNUNET_break (0);
@@ -258,20 +209,27 @@ void zone_proc (void *cls,
       }
       else
       {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Received invalid record count\n");
         failed = GNUNET_YES;
         GNUNET_break (0);
       }
-      if (0 != memcmp (signature, sig_2, sizeof (struct GNUNET_CRYPTO_RsaSignature)))
-      {
-        failed = GNUNET_YES;
-        GNUNET_break (0);
-      }
     }
-    else if (0 == strcmp (name, s_name_3))
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Comparing result failed: got name `%s' for first zone\n", label);
+      failed = GNUNET_YES;
+      GNUNET_break (0);
+    }
+  }
+  else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  {
+    if (0 == strcmp (label, s_name_3))
     {
       if (rd_count == 1)
       {
-        if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_3))
+        if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
         {
           failed = GNUNET_YES;
           GNUNET_break (0);
@@ -279,72 +237,58 @@ void zone_proc (void *cls,
       }
       else
       {
-        failed = GNUNET_YES;
-        GNUNET_break (0);
-      }
-      if (0 != memcmp (signature, sig_3, sizeof (struct GNUNET_CRYPTO_RsaSignature)))
-      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Received invalid record count\n");
         failed = GNUNET_YES;
         GNUNET_break (0);
       }
     }
     else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result failed: got name `%s'\n", name);
-      res = 1;
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Comparing result failed: got name `%s' for first zone\n", label);
+      failed = GNUNET_YES;
       GNUNET_break (0);
-      GNUNET_SCHEDULER_add_now (&end, NULL);
     }
-
-    if (failed == GNUNET_NO)
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Received invalid zone\n");
+    failed = GNUNET_YES;
+    GNUNET_break (0);
+  }
+  if (failed == GNUNET_NO)
+  {
+    if (1 == returned_records)
     {
-      returned_records ++;
-
-      if (1 == returned_records)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping zone iteration after %u received record \n",returned_records );
-        GNUNET_NAMESTORE_zone_iteration_stop (zi);
-        if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
-        {
-          GNUNET_SCHEDULER_cancel (endbadly_task);
-          endbadly_task = GNUNET_SCHEDULER_NO_TASK;
-        }
-        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), &end , NULL);
-        return;
-      }
-      else
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Telling namestore to stop zone iteration\n");
+               GNUNET_NAMESTORE_zone_iteration_stop (zi);
+               zi = NULL;
+      if (NULL != endbadly_task)
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Telling namestore to send the next result\n");
-        GNUNET_NAMESTORE_zone_iterator_next (zi);
+       GNUNET_SCHEDULER_cancel (endbadly_task);
+       endbadly_task = NULL;
       }
+      res = 0;
+      GNUNET_SCHEDULER_add_delayed (WAIT, &end, NULL);
+      return;
     }
-    else
-    {
-      GNUNET_break (0);
-      GNUNET_SCHEDULER_add_now (&end, NULL);
-    }
+    returned_records ++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Telling namestore to send the next result\n");
+    GNUNET_NAMESTORE_zone_iterator_next (zi);
   }
-}
-
-void
-delete_existing_db (const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  char *afsdir;
-
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_filename (cfg, "namestore-sqlite",
-                                               "FILENAME", &afsdir))
+  else
   {
-    if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
-      if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
-        if (GNUNET_OK == GNUNET_DISK_directory_remove(afsdir))
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleted existing database `%s' \n", afsdir);
-   GNUNET_free (afsdir);
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_add_now (&end, NULL);
   }
-
 }
 
-void
+
+static void
 put_cont (void *cls, int32_t success, const char *emsg)
 {
   static int c = 0;
@@ -356,10 +300,13 @@ put_cont (void *cls, int32_t success, const char *emsg)
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n",
+               emsg);
     GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (endbadly_task);
+    if (NULL != endbadly_task)
+       GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    return;
   }
 
   if (c == 3)
@@ -368,115 +315,164 @@ put_cont (void *cls, int32_t success, const char *emsg)
     returned_records = 0;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over all zones \n");
     zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
-                                        NULL,
-                                        GNUNET_NAMESTORE_RF_NONE,
-                                        GNUNET_NAMESTORE_RF_NONE,
-                                        zone_proc,
-                                        &zone);
+                                              NULL,
+                                              &zone_proc,
+                                              NULL);
     if (zi == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n");
       GNUNET_break (0);
-      GNUNET_SCHEDULER_cancel (endbadly_task);
+      if (NULL != endbadly_task)
+       GNUNET_SCHEDULER_cancel (endbadly_task);
       endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      return;
     }
   }
 }
 
-static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+
+static struct GNUNET_GNSRECORD_Data *
+create_record (unsigned int count)
 {
-  int c;
-  struct GNUNET_NAMESTORE_RecordData * rd;
-  rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+  unsigned int c;
+  struct GNUNET_GNSRECORD_Data * rd;
 
+  rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data));
   for (c = 0; c < count; c++)
   {
-    rd[c].expiration = GNUNET_TIME_absolute_get();
+    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;
 }
 
+
+/**
+ * Callback called from the zone iterator when we iterate over
+ * the empty zone.  Check that we got no records and then
+ * start the actual tests by filling the zone.
+ */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+empty_zone_proc (void *cls,
+                const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                const char *label,
+                unsigned int rd_count,
+                const struct GNUNET_GNSRECORD_Data *rd)
 {
-  delete_existing_db(cfg);
-  endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL);
-
-  privkey = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey");
-  GNUNET_assert (privkey != NULL);
-  GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
-  GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone);
+  char *hostkey_file;
 
-  privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey2");
-  GNUNET_assert (privkey2 != NULL);
-  GNUNET_CRYPTO_rsa_key_get_public(privkey2, &pubkey2);
-  GNUNET_CRYPTO_hash(&pubkey2, sizeof (pubkey), &zone2);
+  GNUNET_assert (nsh == cls);
+       if (NULL != zone)
+       {
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                       _("Expected empty zone but received zone private key\n"));
+    GNUNET_break (0);
+    if (endbadly_task != NULL)
+       GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    return;
+       }
+       if ((NULL != label) || (NULL != rd) || (0 != rd))
+       {
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                       _("Expected no zone content but received data\n"));
+    GNUNET_break (0);
+    if (endbadly_task != NULL)
+       GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    return;
+       }
 
 
-  start_arm (cfgfile);
-  GNUNET_assert (arm != NULL);
+  zi = NULL;
+  GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
+      "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
+  privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
+  GNUNET_free (hostkey_file);
+  GNUNET_assert (privkey != NULL);
 
-  nsh = GNUNET_NAMESTORE_connect (cfg);
-  GNUNET_break (NULL != nsh);
+  GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
+      "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
+  privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
+  GNUNET_free (hostkey_file);
+  GNUNET_assert (privkey2 != NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n");
 
   GNUNET_asprintf(&s_name_1, "dummy1");
   s_rd_1 = create_record(1);
-  sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_name_1, s_rd_1, 1);
-  GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL);
-
+  GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_1,
+               1, s_rd_1, &put_cont, NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n");
   GNUNET_asprintf(&s_name_2, "dummy2");
   s_rd_2 = create_record(1);
-
-  sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_name_2, s_rd_2, 1);
-  GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL);
+  GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_2,
+               1, s_rd_2, &put_cont, NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n");
+
   /* name in different zone */
   GNUNET_asprintf(&s_name_3, "dummy3");
   s_rd_3 = create_record(1);
-  sig_3 = GNUNET_NAMESTORE_create_signature(privkey, s_name_3, s_rd_3, 1);
-  GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_absolute_get_forever(), 1, s_rd_3, sig_3, &put_cont, NULL);
+  GNUNET_NAMESTORE_records_store(nsh, privkey2, s_name_3,
+               1, s_rd_3, &put_cont, NULL);
 }
 
-static int
-check ()
-{
-  static char *const argv[] = { "test_namestore_api_zone_iteration",
-    "-c",
-    "test_namestore_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
 
-  res = 1;
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test_namestore_api_zone_iteration",
-                      "nohelp", options, &run, &res);
-  return res;
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
+{
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONFIGURATION_get_value_string (cfg,
+                                                        "PATHS",
+                                                        "GNUNET_TEST_HOME",
+                                                        &directory));
+  GNUNET_DISK_directory_remove (directory);
+
+  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &endbadly, NULL);
+  nsh = GNUNET_NAMESTORE_connect (cfg);
+  GNUNET_break (NULL != nsh);
+  /* first, iterate over empty namestore */
+  zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
+                                            NULL, &empty_zone_proc, nsh);
+  if (NULL == zi)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to create zone iterator\n");
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+  }
 }
 
+
 int
 main (int argc, char *argv[])
 {
-  int ret;
-
-  ret = check ();
-
-  return ret;
+  res = 1;
+  if (0 !=
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
+  return res;
 }
 
-/* end of test_namestore_api_zone_iteration.c */
+/* end of test_namestore_api_zone_iteration_stop.c */