bugfixes and redesigning scheduler API

2 files changed, 1 insertions, 10 deletions

diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index b156ddfaf..cdf3da809 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -523,9 +523,6 @@ schedule_peer_search ()
               (unsigned long long) delay.value);
 #endif 
   GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_NO,
-                                GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                GNUNET_SCHEDULER_NO_TASK,
                                 delay,
                                 &find_more_peers,
                                 NULL);
@@ -823,9 +820,6 @@ core_init (void *cls,
 #endif  
   if (autoconnect)
     GNUNET_SCHEDULER_add_delayed (sched,
-                                  GNUNET_NO,
-                                  GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                  GNUNET_SCHEDULER_NO_TASK,
                                   GNUNET_TIME_UNIT_SECONDS /* give core time to tell us about existing connections */,
                                   &find_more_peers,
                                   NULL);
@@ -1227,9 +1221,6 @@ run (void *cls,
                        handlers);
 
   GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_YES,
-                                GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                GNUNET_SCHEDULER_NO_TASK,
                                 GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleaning_task, NULL);
 }
diff --git a/src/topology/test_gnunet_service_topology.c b/src/topology/test_gnunet_service_topology.c
index b2790c0c9..2536f5454 100644
--- a/src/topology/test_gnunet_service_topology.c
+++ b/src/topology/test_gnunet_service_topology.c
@@ -26,7 +26,7 @@
 
 #define VERBOSE GNUNET_YES
 
-#define NUM_PEERS 10
+#define NUM_PEERS 4
 
 /**
  * How long until we give up on connecting the peers?