plugin datastore mysql

[oweals/gnunet.git] / src / consensus / test_consensus_api.c

diff --git a/src/consensus/test_consensus_api.c b/src/consensus/test_consensus_api.c
index c79a6221c27cfc39ad8863c557784bd132ea1d66..85707eed10625da9de5cf9484113b0dcd749b51a 100644 (file)
--- a/src/consensus/test_consensus_api.c
+++ b/src/consensus/test_consensus_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 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
@@ -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.
 */
 
 /**
@@ -32,26 +32,23 @@ static struct GNUNET_CONSENSUS_Handle *consensus;
 
 static struct GNUNET_HashCode session_id;
 
+static unsigned int elements_received;
 
-static int
-conclude_done (void *cls, const struct GNUNET_CONSENSUS_Group *group)
+
+static void
+conclude_done (void *cls)
 {
-  if (NULL == group)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "conclude over\n");
-    GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_NO;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "concluded\n");
-  return GNUNET_YES;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "conclude over\n");
+  if (2 != elements_received)
+    GNUNET_assert (0);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
-static int
+static void
 on_new_element (void *cls,
-                struct GNUNET_CONSENSUS_Element *element)
+                const struct GNUNET_SET_Element *element)
 {
-  GNUNET_assert (0);
-  return GNUNET_YES;
+  elements_received++;
 }
 
 static void
@@ -62,7 +59,7 @@ insert_done (void *cls, int success)
   GNUNET_assert (GNUNET_NO == called);
   called = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "insert done\n");
-  GNUNET_CONSENSUS_conclude (consensus, GNUNET_TIME_UNIT_SECONDS, 0, &conclude_done, NULL);
+  GNUNET_CONSENSUS_conclude (consensus, &conclude_done, NULL);
 }
 
 
@@ -70,11 +67,9 @@ insert_done (void *cls, int success)
  * Signature of the main function of a task.
  *
  * @param cls closure
- * @param tc context information (why was this task triggered now)
  */
 static void
-on_shutdown (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+on_shutdown (void *cls)
 {
   if (NULL != consensus)
   {
@@ -85,25 +80,25 @@ on_shutdown (void *cls,
 
 
 static void
-run (void *cls, 
+run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
   char *str = "foo";
 
-  struct GNUNET_CONSENSUS_Element el1 = {"foo", 4, 0};
-  struct GNUNET_CONSENSUS_Element el2 = {"bar", 4, 0};
+  struct GNUNET_SET_Element el1 = {4, 0, "foo"};
+  struct GNUNET_SET_Element el2 = {5, 0, "quux"};
 
   GNUNET_log_setup ("test_consensus_api",
                     "INFO",
                     NULL);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "testing consensus api\n");
-
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &on_shutdown, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&on_shutdown, NULL);
 
   GNUNET_CRYPTO_hash (str, strlen (str), &session_id);
-  consensus = GNUNET_CONSENSUS_create (cfg, 0, NULL, &session_id, on_new_element, &consensus);
+  consensus = GNUNET_CONSENSUS_create (cfg, 0, NULL, &session_id,
+      GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_SECONDS),
+      GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES),
+      on_new_element, &consensus);
   GNUNET_assert (consensus != NULL);
 
   GNUNET_CONSENSUS_insert (consensus, &el1, NULL, &consensus);
@@ -114,11 +109,7 @@ run (void *cls,
 int
 main (int argc, char **argv)
 {
-  int ret;
-
-  ret = GNUNET_TESTING_peer_run ("test_consensus_api",
-                                 "test_consensus.conf",
-                                 &run, NULL);
-  return ret;
+  return GNUNET_TESTING_peer_run ("test_consensus_api",
+                                 "test_consensus.conf",
+                                 &run, NULL);
 }
-