/*
This file is part of GNUnet.
- (C) 2013 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
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.
*/
/**
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
#include "gnunet_testing_lib.h"
/**
* Handle for task for timeout termination.
- */
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+ */
+static struct GNUNET_SCHEDULER_Task * endbadly_task;
/**
* Termiante the testcase (failure).
*
* @param cls NULL
- * @param tc scheduler context
*/
static void
-endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+endbadly (void *cls)
{
cleanup ();
res = 1;
* Termiante the testcase (success).
*
* @param cls NULL
- * @param tc scheduler context
*/
static void
-end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_normally (void *cls)
{
cleanup ();
res = 0;
/**
* Finish the testcase (successfully).
*/
-static void
+static void
end ()
{
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ if (endbadly_task != NULL)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+ endbadly_task = NULL;
}
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
- &end_normally, NULL);
+ GNUNET_SCHEDULER_add_now (&end_normally, NULL);
}
const char *emsg)
{
GNUNET_assert (NULL != emsg);
- op = GNUNET_IDENTITY_delete (h,
+ op = GNUNET_IDENTITY_delete (h,
"test",
- &delete_cont,
+ &delete_cont,
NULL);
end (); /* yepee */
}
const char *emsg)
{
GNUNET_assert (NULL == emsg);
- op = GNUNET_IDENTITY_rename (h,
+ op = GNUNET_IDENTITY_rename (h,
"test-id",
"test",
- &fail_rename_cont,
+ &fail_rename_cont,
NULL);
}
* Called with events about created ego.
*
* @param cls NULL
- * @param ego ego handle
- * @param ego_ctx context for application to store data for this ego
- * (during the lifetime of this process, initially NULL)
- * @param identifier identifier assigned by the user for this ego,
- * NULL if the user just deleted the ego and it
- * must thus no longer be used
+ * @param emsg error message
*/
static void
create_cb (void *cls,
- struct GNUNET_IDENTITY_Ego *ego,
- void **ctx,
- const char *identifier)
-{
- op = GNUNET_IDENTITY_rename (h,
+ const char *emsg)
+{
+ GNUNET_assert (NULL == emsg);
+ op = GNUNET_IDENTITY_rename (h,
"test-id",
"test",
- &success_rename_cont,
+ &success_rename_cont,
NULL);
}
* @param peer handle to access more of the peer (not used)
*/
static void
-run (void *cls,
+run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &endbadly, NULL);
+ endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &endbadly, NULL);
h = GNUNET_IDENTITY_connect (cfg, ¬ification_cb, NULL);
GNUNET_assert (NULL != h);
op = GNUNET_IDENTITY_create (h,
"test-id",
&create_cb,
NULL);
-
+
}
int
main (int argc, char *argv[])
{
+ GNUNET_DISK_directory_remove ("/tmp/test-identity-service");
res = 1;
- if (0 !=
+ if (0 !=
GNUNET_TESTING_service_run ("test-identity",
"identity",
"test_identity.conf",