- verboser log, faster start
[oweals/gnunet.git] / src / testbed / test_testbed_api_topology.c
index d3ce82895efde126f7be6b4faa845519fbe7f17d..0098dbea4cfde45103c44ddc5ba0c5cc79b5e513 100644 (file)
@@ -102,7 +102,7 @@ controller_event_cb (void *cls,
     break;
   default:
     GNUNET_break (0);
-    if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && 
+    if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) &&
         (NULL != event->details.operation_finished.emsg))
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "An operation failed with error: %s\n",
@@ -110,7 +110,7 @@ controller_event_cb (void *cls,
     result = GNUNET_SYSERR;
     GNUNET_SCHEDULER_cancel (shutdown_task);
     shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-  }  
+  }
 }
 
 
@@ -135,12 +135,16 @@ test_master (void *cls, unsigned int num_peers,
   peers = peers_;
   overlay_connects = 0;
   op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL,
-                                                 GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
-                                                  NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END);
+                                                  NULL,
+                                                  NULL,
+                                                  GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
+                                                  NUM_PEERS,
+                                                  GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   GNUNET_assert (NULL != op);
-  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                                (GNUNET_TIME_UNIT_SECONDS, 300),
-                                                do_shutdown, NULL);
+  shutdown_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                    (GNUNET_TIME_UNIT_SECONDS, 300),
+                                    do_shutdown, NULL);
 }
 
 
@@ -157,9 +161,8 @@ main (int argc, char **argv)
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
   (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
-                                  "test_testbed_api.conf", 
-                                  NUM_PEERS, event_mask, &controller_event_cb,
-                                  NULL, 
+                                  "test_testbed_api.conf", NUM_PEERS,
+                                  event_mask, &controller_event_cb, NULL,
                                   &test_master, NULL);
   if (GNUNET_OK != result)
     return 1;