- minor renamings

[oweals/gnunet.git] / src / testing / gnunet-testing.c

diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c
index a39891e49f39e771f3df9818c470be08c3cddf89..a79e836c73180505076f646e871746ef77b70171 100644 (file)
--- a/src/testing/gnunet-testing.c
+++ b/src/testing/gnunet-testing.c
@@ -164,7 +164,7 @@ create_hostkeys (const unsigned int no)
   struct GNUNET_TESTING_System *system;
   struct GNUNET_PeerIdentity id;
   struct GNUNET_DISK_FileHandle *fd;
-  struct GNUNET_CRYPTO_EccPrivateKey *pk;
+  struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
 
   system = GNUNET_TESTING_system_create ("testing", NULL, NULL, NULL);
   pk = GNUNET_TESTING_hostkey_get (system, create_no, &id);
@@ -182,7 +182,7 @@ create_hostkeys (const unsigned int no)
                              GNUNET_DISK_PERM_USER_WRITE);
   GNUNET_assert (fd != NULL);
   ret = GNUNET_DISK_file_write (fd, pk,
-                               sizeof (struct GNUNET_CRYPTO_EccPrivateKey));
+                               sizeof (struct GNUNET_CRYPTO_EddsaPrivateKey));
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fd));
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
                   "Wrote hostkey to file: `%s'\n", create_hostkey);
@@ -197,7 +197,7 @@ create_hostkeys (const unsigned int no)
  * Removes the temporary file.
  *
  * @param cls unused
- * @param tc scheduler context 
+ * @param tc scheduler context
  */
 static void
 cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -221,10 +221,10 @@ cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Called whenever we can read stdin non-blocking 
+ * Called whenever we can read stdin non-blocking
  *
  * @param cls unused
- * @param tc scheduler context 
+ * @param tc scheduler context
  */
 static void
 stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -259,7 +259,7 @@ stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     break;
   }
   tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
-                                        &stdin_cb, NULL);    
+                                        &stdin_cb, NULL);
 }
 
 
@@ -282,7 +282,7 @@ testing_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  if (GNUNET_SYSERR == 
+  if (GNUNET_SYSERR ==
       GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg,
                                   tmpfilename))
   {
@@ -315,10 +315,6 @@ run_no_scheduler (void *cls, char *const *args, const char *cfgfile,
   {
     ret = GNUNET_TESTING_service_run ("gnunet_service_test", run_service_name,
                                       cfgfile, &testing_main, NULL);
-    if (0 != ret)
-      printf ("error\n");
-    else 
-      printf ("bye\n");
     return;
   }
 
@@ -326,7 +322,7 @@ run_no_scheduler (void *cls, char *const *args, const char *cfgfile,
   {
     if (create_no > 0)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Creating %u configuration files based on template `%s'\n", create_no, create_cfg_template);
       ret = create_unique_cfgs (create_cfg_template, create_no);
     }