X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_remove_not_existing_record.c;h=ef199cdf601155a57297a737e28005ce007f72ea;hb=284cfac7a521ad275b7536ce1075f62b6e45ea44;hp=86cf47e26976a718e98d15c615f0be2bc266a961;hpb=61c39c60565b386e0e12ea669556b030e8cd7180;p=oweals%2Fgnunet.git

diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c
index 86cf47e26..ef199cdf6 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      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_remove_not_existing_record.c
@@ -36,16 +36,17 @@
 
 static struct GNUNET_NAMESTORE_Handle *nsh;
 
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+static struct GNUNET_SCHEDULER_Task * endbadly_task;
 
-static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
 
-static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
+static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
 
 static int res;
 
 static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
 
+static char *directory;
 
 static void
 cleanup ()
@@ -68,10 +69,9 @@ cleanup ()
  * Re-establish the connection to the service.
  *
  * @param cls handle to use to re-connect.
- * @param tc scheduler context
  */
 static void
-endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+endbadly (void *cls)
 {
   if (NULL != nsqe)
   {
@@ -84,7 +84,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
 {
   cleanup ();
   res = 0;
@@ -95,40 +95,31 @@ static void
 put_cont (void *cls, int32_t success, const char *emsg)
 {
   GNUNET_assert (NULL != cls);
-
   nsqe = NULL;
-
-  if (GNUNET_SYSERR == success)
+  if (endbadly_task != NULL)
   {
-  	GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-  	      _("Namestore could not remove record: `%s'\n"), emsg);
-    if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
-      GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task =  GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = NULL;
   }
-  else if (GNUNET_OK == success)
-  {
-  	GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-  	      _("Namestore did remove not exisiting record: `%s'\n"), emsg);
-    if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
-      GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task =  GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-    return;
-  }
-  else
-  {
-  	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-	      "Name was not removed\n");
-  	res = 0;
-    if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (endbadly_task);
-      endbadly_task = GNUNET_SCHEDULER_NO_TASK;
-    }
-  	GNUNET_SCHEDULER_add_now (&end, NULL);
+
+  switch (success) {
+    case GNUNET_NO:
+      /* We expected GNUNET_NO, since record was not found */
+      GNUNET_SCHEDULER_add_now (&end, NULL);
+      break;
+    case GNUNET_OK:
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Namestore could remove non-existing record: `%s'\n",
+                  (NULL !=emsg) ? emsg : "");
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      break;
+    case GNUNET_SYSERR:
+    default:
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Namestore failed: `%s'\n",
+                  (NULL !=emsg) ? emsg : "");
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      break;
   }
 }
 
@@ -141,22 +132,30 @@ run (void *cls,
   char *hostkey_file;
   const char * name = "dummy.dummy.gnunet";
 
+  directory = NULL;
+  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);
   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_ecc_key_create_from_file (hostkey_file);
+  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);
-  GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey);
+  GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
 
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
   nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
-				      0, NULL, &put_cont, (void *) name);
+                                         0, NULL,
+                                         &put_cont, (void *) name);
   if (NULL == nsqe)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -170,12 +169,18 @@ main (int argc, char *argv[])
 {
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api",
-				  "namestore",
-				  "test_namestore_api.conf",
-				  &run,
-				  NULL))
-    return 1;
+      GNUNET_TESTING_peer_run ("test-namestore-api",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   return res;
 }