/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2013 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
* @brief testcase for namestore_api.c
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
static GNUNET_SCHEDULER_TaskIdentifier 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 void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
cleanup ();
res = 0;
put_cont (void *cls, int32_t success, const char *emsg)
{
GNUNET_assert (NULL != cls);
-
nsqe = NULL;
-
if (GNUNET_SYSERR == success)
{
- GNUNET_break (0);
+ 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);
+ "Namestore could not remove record: `%s'\n",
+ emsg);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
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;
+ 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);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
}
}
"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,
main (int argc, char *argv[])
{
res = 1;
- if (0 !=
- GNUNET_TESTING_service_run ("test-namestore-api",
- "namestore",
- "test_namestore_api.conf",
- &run,
- NULL))
+ if (0 !=
+ GNUNET_TESTING_peer_run ("test-namestore-api",
+ "test_namestore_api.conf",
+ &run,
+ NULL))
return 1;
return res;
}