big scheduler refactoring, expect some issues

[oweals/gnunet.git] / src / topology / test_gnunet_daemon_topology.c

diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c
index 62dc576eb98c5a0459f7d5fbb855c760f44f1d80..529496f1157098a6fae9716b1f94ce3ea7323290 100644 (file)
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -31,7 +31,7 @@
 /**
  * How long until we give up on connecting the peers?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
 
 #define CONNECT_ATTEMPTS 3
 
@@ -48,8 +48,6 @@ static struct GNUNET_TESTING_Daemon *first;
 
 static struct GNUNET_TESTING_Daemon *last;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 /**
  * Check whether peers successfully shut down.
  */
@@ -108,8 +106,7 @@ notify_connect_complete(void *cls,
     {
       /* FIXME: check that topology adds a few more links
         in addition to those that were seeded */
-      GNUNET_SCHEDULER_add_now (sched,
-                               &clean_up_task,
+      GNUNET_SCHEDULER_add_now (&clean_up_task,
                                NULL);
     }
 }
@@ -145,19 +142,17 @@ static void my_cb(void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  sched = s;
   ok = 1;
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Starting daemons.\n");
 #endif
   peers_left = NUM_PEERS;
-  pg = GNUNET_TESTING_daemons_start (sched, cfg, 
+  pg = GNUNET_TESTING_daemons_start (cfg,
                                     peers_left,
                                     TIMEOUT,
                                     NULL, NULL,