gpl3

[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 cad789a6f8eea337967c1b0656811d3a5ded6029..9c3a602fbda9976c394922a02c8b3c5a4dffd228 100644 (file)
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -33,7 +33,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 /**
  * Number of iterations to run; must be large enough
@@ -144,7 +144,7 @@ check_value (void *cls,
             const GNUNET_HashCode * key,
             uint32_t size,
             const void *data,
-            uint32_t type,
+            enum GNUNET_BLOCK_Type type,
             uint32_t priority,
             uint32_t anonymity,
             struct GNUNET_TIME_Absolute
@@ -189,14 +189,14 @@ check_value (void *cls,
 
 static void 
 check_nothing (void *cls,
-            const GNUNET_HashCode * key,
-            uint32_t size,
-            const void *data,
-            uint32_t type,
-            uint32_t priority,
-            uint32_t anonymity,
-            struct GNUNET_TIME_Absolute
-            expiration, uint64_t uid)
+              const GNUNET_HashCode * key,
+              uint32_t size,
+              const void *data,
+              enum GNUNET_BLOCK_Type type,
+              uint32_t priority,
+              uint32_t anonymity,
+              struct GNUNET_TIME_Absolute
+              expiration, uint64_t uid)
 {
   struct CpsRunContext *crc = cls;
 
@@ -235,7 +235,7 @@ run_continuation (void *cls,
                            get_priority (crc->i),
                            get_anonymity (crc->i),
                            get_expiration (crc->i),
-                           TIMEOUT,
+                           1, 1, TIMEOUT,
                            &check_success,
                            crc);
       crc->i++;
@@ -259,9 +259,9 @@ run_continuation (void *cls,
       GNUNET_DATASTORE_get (datastore, 
                            &crc->key,
                            get_type (crc->i),
+                           1, 1, TIMEOUT,
                            &check_value,
-                           crc,
-                           TIMEOUT);
+                           crc);
       break;
     case RP_GET_FAIL:
 #if VERBOSE
@@ -274,9 +274,9 @@ run_continuation (void *cls,
       GNUNET_DATASTORE_get (datastore, 
                            &crc->key,
                            get_type (crc->i),
+                           1, 1, TIMEOUT,
                            &check_nothing,
-                           crc,
-                           TIMEOUT);
+                           crc);
       break;
     case RP_DONE:
       GNUNET_assert (0 == crc->i);
@@ -330,7 +330,7 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  pid = GNUNET_OS_start_process ("gnunet-service-arm",
+  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                  "gnunet-service-arm",
 #if VERBOSE
                                  "-L", "DEBUG",