fix names

diff --git a/src/cadet/test_cadeT.c b/src/cadet/test_cadeT.c
index 014c64ebd7639110fc7e760acf80c9effb86acf0..70f141514e43da77731b7b18f6626bcd12f08f8b 100644 (file)
--- a/src/cadet/test_cadeT.c
+++ b/src/cadet/test_cadeT.c
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
   GNUNET_TESTBED_test_run (TESTPROGAM_NAME,
                            CONFIG,
                            REQUESTED_PEERS, 0LL, NULL, NULL,
-                           connect_to_peers, NULL);
+                           prepare_test, NULL);
   return test_result;
 }
 

diff --git a/src/cadet/test_cadeT_util.c b/src/cadet/test_cadeT_util.c
index 2db619a389c89b1c118c433f3d41d6ad0cebfd90..f087e624c95b32fd21f7cd6c47c4c644d59c9a25 100644 (file)
--- a/src/cadet/test_cadeT_util.c
+++ b/src/cadet/test_cadeT_util.c
@@ -189,7 +189,6 @@ setup_listening_peer (void *cls,
   return cadet;
 }
 
-
 static void
 check_test_readyness (void *cls,
                       struct GNUNET_TESTBED_Operation *op,
@@ -204,7 +203,6 @@ check_test_readyness (void *cls,
     run_test();
 }
 
-
 static int
 peerinfo_complete ()
 {
@@ -240,18 +238,19 @@ connect_to_service (void *cb_cls,
 }
 
 void
-connect_to_peers (void *cls,
-                  struct GNUNET_TESTBED_RunHandle *h,
-                  unsigned int num_peers,
-                  struct GNUNET_TESTBED_Peer **peers,
-                  unsigned int links_succeeded,
-                  unsigned int links_failed)
+prepare_test (void *cls,
+              struct GNUNET_TESTBED_RunHandle *h,
+              unsigned int num_peers,
+              struct GNUNET_TESTBED_Peer **peers,
+              unsigned int links_succeeded,
+              unsigned int links_failed)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%s\n", __func__);
 
   GNUNET_assert (GNUNET_NO == links_failed);
+  GNUNET_assert (REQUESTED_PEERS == num_peers);
 
-  for (int i=0; i<num_peers; i++)
+  for (int i=0; i<REQUESTED_PEERS; i++)
   {
     test_peers[i].ready = GNUNET_NO;
     test_peers[i].idx = i;
@@ -268,6 +267,7 @@ connect_to_peers (void *cls,
                                                              &test_peers[1]);
 
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
+
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, TIMEOUT_IN_SEC), 
                                 &timeout, NULL);
 }

diff --git a/src/cadet/test_cadeT_util.h b/src/cadet/test_cadeT_util.h
index 361c10a26eed947b6e45216e677d388ae3b221ab..b2afa34a143cd23dcf8c66c0d203924eeab976bf 100644 (file)
--- a/src/cadet/test_cadeT_util.h
+++ b/src/cadet/test_cadeT_util.h
@@ -33,6 +33,6 @@
 
 int test_result;
 
-void connect_to_peers ();
+void prepare_test ();
 
 void run_test ();