- simplify parameters

[oweals/gnunet.git] / src / datastore / test_datastore_api_management.c

diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 9b5fb4e6f2563374e7ad2d54a56a579dcf91d2df..9eae32f4ae59939fe82dd9cd08d324d0ffcdf251 100644 (file)
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -26,7 +26,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 
 /**
@@ -51,7 +51,7 @@ enum RunPhase
 
 struct CpsRunContext
 {
-  GNUNET_HashCode key;
+  struct GNUNET_HashCode key;
   int i;
   int found;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -138,7 +138,7 @@ check_success (void *cls, int success, struct GNUNET_TIME_Absolute min_expiratio
 
 
 static void
-check_value (void *cls, const GNUNET_HashCode * key, size_t size,
+check_value (void *cls, const struct GNUNET_HashCode * key, size_t size,
              const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
              uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
              uint64_t uid)
@@ -170,7 +170,7 @@ check_value (void *cls, const GNUNET_HashCode * key, size_t size,
 
 
 static void
-check_nothing (void *cls, const GNUNET_HashCode * key, size_t size,
+check_nothing (void *cls, const struct GNUNET_HashCode * key, size_t size,
                const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
                uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
                uint64_t uid)
@@ -259,10 +259,11 @@ run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, c
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct CpsRunContext *crc;
-  static GNUNET_HashCode zkey;
+  static struct GNUNET_HashCode zkey;
 
   crc = GNUNET_malloc (sizeof (struct CpsRunContext));
   crc->cfg = cfg;
@@ -286,17 +287,9 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  char *pos;
   char cfg_name[128];
 
-  /* determine name of plugin to use */
-  plugin_name = argv[0];
-  while (NULL != (pos = strstr (plugin_name, "_")))
-    plugin_name = pos + 1;
-  if (NULL != (pos = strstr (plugin_name, ".")))
-    pos[0] = 0;
-  else
-    pos = (char *) plugin_name;
+  plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
   GNUNET_snprintf (cfg_name, sizeof (cfg_name),
                    "test_datastore_api_data_%s.conf", plugin_name);
   if (0 !=