modified test

2 files changed, 15 insertions, 58 deletions

diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index 132b8d39e..22ab2bca4 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -102,7 +102,6 @@ static void
 remove_cont (void *cls, int32_t success, const char *emsg)
 {
   const char *name = cls;
-
   if (GNUNET_YES != success)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
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 b09748e69..396e69ff0 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -43,8 +43,6 @@ static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
 
 static struct GNUNET_CRYPTO_EccPublicKey pubkey;
 
-static struct GNUNET_HashCode derived_hash;
-
 static int res;
 
 static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
@@ -95,83 +93,43 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-rd_decrypt_cb (void *cls,
-                                                 unsigned int rd_count,
-                                                 const struct GNUNET_NAMESTORE_RecordData *rd)
-{
-        GNUNET_assert (0 == rd_count);
-        GNUNET_assert (NULL == rd);
-
-        GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-static void
-name_lookup_proc (void *cls,
-                                                                        const struct GNUNET_NAMESTORE_Block *block)
+put_cont (void *cls, int32_t success, const char *emsg)
 {
-  const char *name = cls;
-  nsqe = NULL;
-
   GNUNET_assert (NULL != cls);
 
-  if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
-  }
+  nsqe = NULL;
 
-  if (NULL == block)
+  if (GNUNET_SYSERR == success)
   {
+        GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _("Namestore returned no block\n"));
+              _("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_log (GNUNET_ERROR_TYPE_INFO,
-              "Namestore returned block, decrypting \n");
-        GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block,
-                &pubkey, name, &rd_decrypt_cb, (void *) name));
-}
-
-static void
-put_cont (void *cls, int32_t success, const char *emsg)
-{
-  const char *name = cls;
-
-  GNUNET_assert (NULL != cls);
-  if (GNUNET_SYSERR == success)
+  else if (GNUNET_OK == success)
   {
         GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _("Namestore could not store record: `%s'\n"), emsg);
+              _("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;
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Name store added record for `%s': %s\n",
-              name,
-              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
-
-  /* Create derived hash */
-  GNUNET_NAMESTORE_query_from_private_key (privkey, name, &derived_hash);
-
-  nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash,
-                                         &name_lookup_proc, (void *) name);
-  if (NULL == nsqe)
+  else
   {
-        GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _("Namestore cannot perform lookup\n"));
+        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_add_now (&endbadly, NULL);
-    return;
+      endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+    }
+        GNUNET_SCHEDULER_add_now (&end, NULL);
   }
 }