towards fixing #3363: replacing old iteration API with new monitoring API for core...

[oweals/gnunet.git] / src / core / test_core_api_send_to_self.c

diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c
index 626c5e15ea35b71d73ab3166db01439ba3006acc..913ae384813c3b4309b480a92e647e3963fe34b6 100644 (file)
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -25,7 +25,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_core_service.h"
 #include "gnunet_constants.h"
@@ -71,8 +71,7 @@ cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
 
 static int
 receive (void *cls, const struct GNUNET_PeerIdentity *other,
-         const struct GNUNET_MessageHeader *message,
-         const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
+         const struct GNUNET_MessageHeader *message)
 {
   if (die_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (die_task);
@@ -104,12 +103,12 @@ send_message (void *cls, size_t size, void *buf)
 
 
 static void
-init (void *cls, struct GNUNET_CORE_Handle *core,
+init (void *cls,
       const struct GNUNET_PeerIdentity *my_identity)
 {
-  if (core == NULL)
+  if (NULL == my_identity)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could NOT connect to CORE;\n");
+    GNUNET_break (0);
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -120,8 +119,7 @@ init (void *cls, struct GNUNET_CORE_Handle *core,
 
 
 static void
-connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
-            const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s.\n",
               GNUNET_i2s (peer));
@@ -154,7 +152,7 @@ run (void *cls,
   };
   core =
     GNUNET_CORE_connect (cfg, NULL, &init, &connect_cb, NULL, NULL,
-                        0, NULL, 0, handlers); 
+                        0, NULL, 0, handlers);
   die_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                     (GNUNET_TIME_UNIT_SECONDS, 300), &cleanup,