[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29201 - gnunet/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29201 - gnunet/src/namestore |
Date: |
Wed, 11 Sep 2013 14:26:59 +0200 |
Author: wachs
Date: 2013-09-11 14:26:59 +0200 (Wed, 11 Sep 2013)
New Revision: 29201
Modified:
gnunet/src/namestore/test_namestore_api_remove.c
gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
Log:
modified test
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2013-09-11 12:23:56 UTC
(rev 29200)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2013-09-11 12:26:59 UTC
(rev 29201)
@@ -102,7 +102,6 @@
remove_cont (void *cls, int32_t success, const char *emsg)
{
const char *name = cls;
-
if (GNUNET_YES != success)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
Modified: gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2013-09-11 12:23:56 UTC (rev 29200)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2013-09-11 12:26:59 UTC (rev 29201)
@@ -43,8 +43,6 @@
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 @@
static void
-rd_decrypt_cb (void *cls,
- unsigned int rd_count,
- const struct
GNUNET_NAMESTORE_RecordData *rd)
+put_cont (void *cls, int32_t success, const char *emsg)
{
- GNUNET_assert (0 == rd_count);
- GNUNET_assert (NULL == rd);
+ GNUNET_assert (NULL != cls);
- GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-static void
-name_lookup_proc (void *cls,
- const
struct GNUNET_NAMESTORE_Block *block)
-{
- const char *name = cls;
nsqe = NULL;
- GNUNET_assert (NULL != cls);
-
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SYSERR == success)
{
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
- if (NULL == block)
- {
+ 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);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29201 - gnunet/src/namestore,
gnunet <=