-renaming gnunet-gns to gnunet-namestore

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

diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index e9b13ccf5b03a1c53da2b20df0e58df8c5bc05f8..78a5be56a6c7f7a0c7f56706897dd2aef06f570d 100644 (file)
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -167,14 +167,19 @@ void name_lookup_proc (void *cls,
 
     for (c = 0; c < rd_count; c++)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record [%u]: type: %u, size %u\n", c, rd[c].record_type, rd[c].data_size);
-      GNUNET_break (rd[c].expiration.abs_value == s_rd[c+1].expiration.abs_value);
-      GNUNET_break (rd[c].record_type == TEST_RECORD_TYPE);
-      GNUNET_break (rd[c].data_size == TEST_RECORD_DATALEN);
-      GNUNET_break (0 == memcmp (rd[c].data, s_rd[c+1].data, TEST_RECORD_DATALEN));
+      if (GNUNET_NO == GNUNET_NAMESTORE_records_cmp (&rd[c], &s_rd[c+1]))
+      {
+        GNUNET_break (0);
+        failed = GNUNET_YES;
+      }
+    }
+
+    if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(&pubkey, n, rd_count, rd, signature))
+    {
+      GNUNET_break (0);
+      failed = GNUNET_YES;
     }
 
-    found = GNUNET_YES;
     if (failed == GNUNET_NO)
       res = 0;
     else
@@ -205,7 +210,7 @@ remove_cont (void *cls, int32_t success, const char *emsg)
   else
   {
     res = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to put records for name `%s'\n", name);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove record for name `%s'\n", name);
     GNUNET_SCHEDULER_add_now(&end, NULL);
   }
 
@@ -241,10 +246,9 @@ create_record (int count)
   rd[0].expiration = GNUNET_TIME_absolute_get();
   rd[0].record_type = 0;
   rd[0].data_size = TEST_REMOVE_RECORD_DATALEN;
-  rd[0].data = GNUNET_malloc(TEST_RECORD_DATALEN);
+  rd[0].data = GNUNET_malloc(TEST_REMOVE_RECORD_DATALEN);
   memset ((char *) rd[0].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
 
-
   for (c = 1; c < RECORDS; c++)
   {
   rd[c].expiration = GNUNET_TIME_absolute_get();
@@ -257,10 +261,29 @@ create_record (int count)
   return rd;
 }
 
+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))
+  {
+    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);
+  }
+
+}
+
 static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  delete_existing_db(cfg);
   endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
   size_t rd_ser_len;
 
@@ -300,7 +323,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                               GNUNET_TIME_absolute_get_forever(),
                               RECORDS, s_rd, s_signature, put_cont, s_name);
 
-  GNUNET_free (s_signature);
+
 
 }
 
@@ -331,7 +354,7 @@ main (int argc, char *argv[])
   int ret;
 
   ret = check ();
-
+  GNUNET_free (s_signature);
   return ret;
 }