aboutsummaryrefslogtreecommitdiff
path: root/src/testing/test_testing_connect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/test_testing_connect.c')
-rw-r--r--src/testing/test_testing_connect.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c
index 145989204..8da9b05d8 100644
--- a/src/testing/test_testing_connect.c
+++ b/src/testing/test_testing_connect.c
@@ -43,8 +43,6 @@ static struct GNUNET_CONFIGURATION_Handle *c1;
43 43
44static struct GNUNET_CONFIGURATION_Handle *c2; 44static struct GNUNET_CONFIGURATION_Handle *c2;
45 45
46static struct GNUNET_SCHEDULER_Handle *sched;
47
48static void 46static void
49end2_cb (void *cls, const char *emsg) 47end2_cb (void *cls, const char *emsg)
50{ 48{
@@ -99,7 +97,7 @@ my_connect_complete (void *cls,
99 struct GNUNET_TESTING_Daemon *second_daemon, 97 struct GNUNET_TESTING_Daemon *second_daemon,
100 const char *emsg) 98 const char *emsg)
101{ 99{
102 GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL); 100 GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
103} 101}
104 102
105 103
@@ -130,7 +128,7 @@ my_cb1 (void *cls,
130 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 128 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
131 "Daemon `%s' started.\n", GNUNET_i2s (id)); 129 "Daemon `%s' started.\n", GNUNET_i2s (id));
132#endif 130#endif
133 d2 = GNUNET_TESTING_daemon_start (sched, c2, TIMEOUT, NULL, NULL, 0, NULL, NULL, &my_cb2, NULL); 131 d2 = GNUNET_TESTING_daemon_start (c2, TIMEOUT, NULL, NULL, 0, NULL, NULL, &my_cb2, NULL);
134 GNUNET_assert (d2 != NULL); 132 GNUNET_assert (d2 != NULL);
135 133
136} 134}
@@ -138,11 +136,9 @@ my_cb1 (void *cls,
138 136
139static void 137static void
140run (void *cls, 138run (void *cls,
141 struct GNUNET_SCHEDULER_Handle *s,
142 char *const *args, 139 char *const *args,
143 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) 140 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
144{ 141{
145 sched = s;
146 ok = 1; 142 ok = 1;
147#if VERBOSE 143#if VERBOSE
148 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n"); 144 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n");
@@ -151,7 +147,7 @@ run (void *cls,
151 GNUNET_CONFIGURATION_parse (c1, "test_testing_connect_peer1.conf"); 147 GNUNET_CONFIGURATION_parse (c1, "test_testing_connect_peer1.conf");
152 c2 = GNUNET_CONFIGURATION_create (); 148 c2 = GNUNET_CONFIGURATION_create ();
153 GNUNET_CONFIGURATION_parse (c2, "test_testing_connect_peer2.conf"); 149 GNUNET_CONFIGURATION_parse (c2, "test_testing_connect_peer2.conf");
154 d1 = GNUNET_TESTING_daemon_start (sched, c1, TIMEOUT, NULL, NULL, 0, NULL, NULL, &my_cb1, NULL); 150 d1 = GNUNET_TESTING_daemon_start (c1, TIMEOUT, NULL, NULL, 0, NULL, NULL, &my_cb1, NULL);
155 GNUNET_assert (d1 != NULL); 151 GNUNET_assert (d1 != NULL);
156} 152}
157 153