Link libgnunetblockgroup to libgnunetblock

[oweals/gnunet.git] / src / util / test_container_bloomfilter.c

diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c
index 9beb1129898c52b08adb89971984f13ba837c0ec..53fc1c3bc94bd60de225825f90739e0d1ee7a9a0 100644 (file)
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2004, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004, 2009 GNUnet e.V.
 
      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
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file util/test_container_bloomfilter.c
@@ -25,8 +25,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 #define K 4
 #define SIZE 65536
@@ -36,16 +35,16 @@
  * Generate a random hashcode.
  */
 static void
-nextHC (GNUNET_HashCode * hc)
+nextHC (struct GNUNET_HashCode * hc)
 {
-  GNUNET_CRYPTO_hash_create_random (hc);
+  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, hc);
 }
 
 static int
-add_iterator (GNUNET_HashCode * next, void *arg)
+add_iterator (void *cls, struct GNUNET_HashCode * next)
 {
-  int *ret = arg;
-  GNUNET_HashCode pos;
+  int *ret = cls;
+  struct GNUNET_HashCode pos;
 
   if (0 == (*ret)--)
     return GNUNET_NO;
@@ -59,7 +58,7 @@ main (int argc, char *argv[])
 {
   struct GNUNET_CONTAINER_BloomFilter *bf;
   struct GNUNET_CONTAINER_BloomFilter *bfi;
-  GNUNET_HashCode tmp;
+  struct GNUNET_HashCode tmp;
   int i;
   int ok1;
   int ok2;
@@ -68,37 +67,36 @@ main (int argc, char *argv[])
   struct stat sbuf;
 
   GNUNET_log_setup ("test-container-bloomfilter", "WARNING", NULL);
-  srand (1);
-  if (0 == stat (TESTFILE, &sbuf))
+  GNUNET_CRYPTO_seed_weak_random (1);
+  if (0 == STAT (TESTFILE, &sbuf))
     if (0 != UNLINK (TESTFILE))
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink", TESTFILE);
   bf = GNUNET_CONTAINER_bloomfilter_load (TESTFILE, SIZE, K);
 
   for (i = 0; i < 200; i++)
-    {
-      nextHC (&tmp);
-      GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);
-    }
-  srand (1);
+  {
+    nextHC (&tmp);
+    GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);
+  }
+  GNUNET_CRYPTO_seed_weak_random (1);
   ok1 = 0;
   for (i = 0; i < 200; i++)
-    {
-      nextHC (&tmp);
-      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
-    }
+  {
+    nextHC (&tmp);
+    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      ok1++;
+  }
   if (ok1 != 200)
-    {
-      printf ("Got %d elements out of"
-              "200 expected after insertion.\n", ok1);
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      return -1;
-    }
+  {
+    printf ("Got %d elements out of" "200 expected after insertion.\n", ok1);
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    return -1;
+  }
   if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_get_raw_data (bf, buf, SIZE))
-    {
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      return -1;
-    }
+  {
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    return -1;
+  }
 
   GNUNET_CONTAINER_bloomfilter_free (bf);
 
@@ -107,135 +105,134 @@ main (int argc, char *argv[])
   bfi = GNUNET_CONTAINER_bloomfilter_init (buf, SIZE, K);
   GNUNET_assert (bfi != NULL);
 
-  srand (1);
+  GNUNET_CRYPTO_seed_weak_random (1);
   ok1 = 0;
   ok2 = 0;
   for (i = 0; i < 200; i++)
-    {
-      nextHC (&tmp);
-      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
-      if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-        ok2++;
-    }
+  {
+    nextHC (&tmp);
+    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      ok1++;
+    if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
+      ok2++;
+  }
   if (ok1 != 200)
-    {
-      printf ("Got %d elements out of 200 "
-              "expected after reloading.\n", ok1);
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
+  {
+    printf ("Got %d elements out of 200 " "expected after reloading.\n", ok1);
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
 
   if (ok2 != 200)
-    {
-      printf ("Got %d elements out of 200 "
-              "expected after initialization.\n", ok2);
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
-
-  srand (1);
+  {
+    printf ("Got %d elements out of 200 " "expected after initialization.\n",
+            ok2);
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
+
+  GNUNET_CRYPTO_seed_weak_random (1);
   for (i = 0; i < 100; i++)
-    {
-      nextHC (&tmp);
-      GNUNET_CONTAINER_bloomfilter_remove (bf, &tmp);
-      GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);
-    }
+  {
+    nextHC (&tmp);
+    GNUNET_CONTAINER_bloomfilter_remove (bf, &tmp);
+    GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);
+  }
 
-  srand (1);
+  GNUNET_CRYPTO_seed_weak_random (1);
 
   ok1 = 0;
   ok2 = 0;
   for (i = 0; i < 200; i++)
-    {
-      nextHC (&tmp);
-      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
-      if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-        ok2++;
-    }
+  {
+    nextHC (&tmp);
+    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      ok1++;
+    if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
+      ok2++;
+  }
 
   if (ok1 != 100)
-    {
-      printf ("Expected 100 elements in loaded filter"
-              " after adding 200 and deleting 100, got %d\n", ok1);
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
+  {
+    printf ("Expected 100 elements in loaded filter"
+            " after adding 200 and deleting 100, got %d\n", ok1);
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
   if (ok2 != 200)
-    {
-      printf ("Expected 200 elements in initialized filter"
-              " after adding 200 and deleting 100 "
-              "(which should do nothing for a filter not backed by a file), got %d\n",
-              ok2);
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
-
-  srand (3);
+  {
+    printf ("Expected 200 elements in initialized filter"
+            " after adding 200 and deleting 100 "
+            "(which should do nothing for a filter not backed by a file), got %d\n",
+            ok2);
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
+
+  GNUNET_CRYPTO_seed_weak_random (3);
 
   GNUNET_CONTAINER_bloomfilter_clear (bf);
   falseok = 0;
   for (i = 0; i < 1000; i++)
-    {
-      nextHC (&tmp);
-      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        falseok++;
-    }
+  {
+    nextHC (&tmp);
+    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      falseok++;
+  }
   if (falseok > 0)
-    {
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
+  {
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
 
   if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_or (bf, buf, SIZE))
-    {
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
+  {
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
 
-  srand (2);
+  GNUNET_CRYPTO_seed_weak_random (2);
   i = 20;
   GNUNET_CONTAINER_bloomfilter_resize (bfi, &add_iterator, &i, SIZE * 2, K);
 
-  srand (2);
+  GNUNET_CRYPTO_seed_weak_random (2);
   i = 20;
   GNUNET_CONTAINER_bloomfilter_resize (bf, &add_iterator, &i, SIZE * 2, K);
-  srand (2);
+  GNUNET_CRYPTO_seed_weak_random (2);
 
   ok1 = 0;
   ok2 = 0;
   for (i = 0; i < 20; i++)
-    {
-      nextHC (&tmp);
-      if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
-        ok1++;
-      if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
-        ok2++;
-    }
+  {
+    nextHC (&tmp);
+    if (GNUNET_CONTAINER_bloomfilter_test (bf, &tmp) == GNUNET_YES)
+      ok1++;
+    if (GNUNET_CONTAINER_bloomfilter_test (bfi, &tmp) == GNUNET_YES)
+      ok2++;
+  }
 
   if (ok1 != 20)
-    {
-      printf ("Expected 20 elements in resized file-backed filter"
-              " after adding 20, got %d\n", ok1);
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
+  {
+    printf ("Expected 20 elements in resized file-backed filter"
+            " after adding 20, got %d\n", ok1);
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
   if (ok2 != 20)
-    {
-      printf ("Expected 20 elements in resized filter"
-              " after adding 20, got %d\n", ok2);
-      GNUNET_CONTAINER_bloomfilter_free (bf);
-      GNUNET_CONTAINER_bloomfilter_free (bfi);
-      return -1;
-    }
+  {
+    printf ("Expected 20 elements in resized filter"
+            " after adding 20, got %d\n", ok2);
+    GNUNET_CONTAINER_bloomfilter_free (bf);
+    GNUNET_CONTAINER_bloomfilter_free (bfi);
+    return -1;
+  }
 
 
   GNUNET_CONTAINER_bloomfilter_free (bf);