X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fidentity%2Ftest_identity.c;h=6797afe3cd0c5ee03b8839ba2637fd9e4a47f1d7;hb=fdbe690beeec04066f18302401096eb5212c3f6a;hp=f97b469f40ec8247f8dd1abf7359e73c7772c8a4;hpb=59fd53ca5b57d1e5bc5aad9099318f4683c742b0;p=oweals%2Fgnunet.git

diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index f97b469f4..6797afe3c 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -24,7 +24,6 @@
  * @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"
@@ -50,7 +49,7 @@ static struct GNUNET_IDENTITY_Operation *op;
 
 /**
  * Handle for task for timeout termination.
- */ 
+ */
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 
@@ -105,7 +104,7 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Finish the testcase (successfully).
  */
-static void 
+static void
 end ()
 {
   if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
@@ -195,9 +194,9 @@ fail_rename_cont (void *cls,
 		  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 */
 }
@@ -214,10 +213,10 @@ success_rename_cont (void *cls,
 		     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);
 }
 
@@ -226,23 +225,17 @@ success_rename_cont (void *cls,
  * 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);
 }
 
@@ -255,27 +248,28 @@ create_cb (void *cls,
  * @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, &notification_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",