- cleanup

[oweals/gnunet.git] / src / ats / test_ats_api_update_address.c

diff --git a/src/ats/test_ats_api_update_address.c b/src/ats/test_ats_api_update_address.c
index 556f13ce42efded34826a004278342b5e7c948c7..12d283aacd7beb750803a10c96a002c2786aa2b2 100644 (file)
--- a/src/ats/test_ats_api_update_address.c
+++ b/src/ats/test_ats_api_update_address.c
@@ -34,17 +34,13 @@
 #include "gnunet_ats_service.h"
 #include "gnunet_transport_service.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
-
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
-
 #define START_ARM GNUNET_YES
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
-#define VALID GNUNET_TIME_absolute_get_forever ()
+#define VALID GNUNET_TIME_UNIT_FOREVER_ABS
 
-static struct GNUNET_ATS_Handle *ats;
+static struct GNUNET_ATS_SchedulingHandle *ats;
 
 static struct GNUNET_ATS_SuggestionContext *asc;
 
@@ -73,7 +69,7 @@ struct AllocationRecord
   /**
    * Performance information associated with this address (array).
    */
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
 
   /**
    * Name of the plugin
@@ -121,8 +117,7 @@ suggest_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
             const char *plugin_name, const void *plugin_addr,
             size_t plugin_addr_len, struct Session *session,
             struct GNUNET_BANDWIDTH_Value32NBO bandwidth,
-            const struct GNUNET_TRANSPORT_ATS_Information *ats,
-            uint32_t ats_count)
+            const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
   struct ExpectedValues *ex = cls;
 
@@ -179,7 +174,7 @@ check (void *cls, char *const *args, const char *cfgfile,
   ar->session = NULL;
   ar->plugin_addr = "address1";
   ar->plugin_addr_len = strlen (ar->plugin_addr) + 1;
-  ar->ats = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+  ar->ats = GNUNET_malloc (sizeof (struct GNUNET_ATS_Information));
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Initial ATS information\n");
   ar->ats_count = 1;
@@ -278,11 +273,7 @@ main (int argc, char *argv1[])
   static char *const argv[] = { "test_ats_api_update_address",
     "-c",
     "test_ats_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };