even longer timeout, still timing out on hostkey generation (sparcbot)

[oweals/gnunet.git] / src / peerinfo / test_peerinfo_api.c

diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index 10ea1fa8179ef8527d401a6ef03930f38d6223b0..34655c8936553f1bb9b79b7ae0e04b2dfdcaf9eb 100644 (file)
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -40,7 +40,7 @@ static struct GNUNET_SCHEDULER_Handle *sched;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-static struct GNUNET_PEERINFO_NewIteratorContext *ic;
+static struct GNUNET_PEERINFO_IteratorContext *ic;
 
 static struct GNUNET_PEERINFO_Handle *h;
 
@@ -50,7 +50,7 @@ static int
 check_it (void *cls,
           const char *tname,
           struct GNUNET_TIME_Absolute expiration,
-          const void *addr, size_t addrlen)
+          const void *addr, uint16_t addrlen)
 {
   unsigned int *agc = cls;
 
@@ -93,7 +93,7 @@ add_peer ()
   memset (&pkey, 32, sizeof (pkey));
   GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
   h2 = GNUNET_HELLO_create (&pkey, &address_generator, &agc);
-  GNUNET_PEERINFO_add_peer_new (h, h2);
+  GNUNET_PEERINFO_add_peer (h, h2);
   GNUNET_free (h2);
 
 }
@@ -102,7 +102,7 @@ add_peer ()
 static void
 process (void *cls,
          const struct GNUNET_PeerIdentity *peer,
-         const struct GNUNET_HELLO_Message *hello, uint32_t trust)
+         const struct GNUNET_HELLO_Message *hello)
 {
   int *ok = cls;
   unsigned int agc;
@@ -116,17 +116,15 @@ process (void *cls,
          /* try again */
          retries++;      
          add_peer ();
-         ic = GNUNET_PEERINFO_iterate_new (h,
-                                           NULL,
-                                           0,
-                                           GNUNET_TIME_relative_multiply
-                                           (GNUNET_TIME_UNIT_SECONDS, 15), 
-                                           &process, cls);
+         ic = GNUNET_PEERINFO_iterate (h,
+                                       NULL,
+                                       GNUNET_TIME_relative_multiply
+                                       (GNUNET_TIME_UNIT_SECONDS, 15), 
+                                       &process, cls);
          return;
        }
       GNUNET_assert (peer == NULL);
       GNUNET_assert (2 == *ok);
-      GNUNET_assert (trust == 0);
       GNUNET_PEERINFO_disconnect (h);
       h = NULL;
       *ok = 0;
@@ -152,14 +150,14 @@ run (void *cls,
 {
   sched = s;
   cfg = c;
-  h = GNUNET_PEERINFO_connect (cfg, sched);
+  h = GNUNET_PEERINFO_connect (sched, cfg);
+  GNUNET_assert (h != NULL);
   add_peer ();
-  ic = GNUNET_PEERINFO_iterate_new (h,
-                                   NULL,
-                                   0,
-                                   GNUNET_TIME_relative_multiply
-                                   (GNUNET_TIME_UNIT_SECONDS, 15),
-                                   &process, cls);
+  ic = GNUNET_PEERINFO_iterate (h,
+                               NULL,
+                               GNUNET_TIME_relative_multiply
+                               (GNUNET_TIME_UNIT_SECONDS, 15),
+                               &process, cls);
 }
 
 
@@ -211,7 +209,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-peerinfo");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-peerinfo");
   return ret;
 }