-fix

[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 53f04c8b1bec26730404ce64c6e42b1fb8678693..c79a6221c27cfc39ad8863c557784bd132ea1d66 100644 (file)
--- a/src/consensus/test_consensus_api.c
+++ b/src/consensus/test_consensus_api.c
@@ -17,6 +17,7 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
+
 /**
  * @file consensus/test_consensus_api.c
  * @brief testcase for consensus_api.c
@@ -24,53 +25,64 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_consensus_service.h"
-#include "gnunet_testing_lib-new.h"
-
-
-static struct GNUNET_CONSENSUS_Handle *consensus1;
-static struct GNUNET_CONSENSUS_Handle *consensus2;
+#include "gnunet_testing_lib.h"
 
-static int concluded1;
-static int concluded2;
 
-static int insert1;
-static int insert2;
+static struct GNUNET_CONSENSUS_Handle *consensus;
 
 static struct GNUNET_HashCode session_id;
 
 
-static void conclude_done (void *cls, 
-                           unsigned int num_peers_in_consensus,
-                           const struct GNUNET_PeerIdentity *peers_in_consensus)
+static int
+conclude_done (void *cls, const struct GNUNET_CONSENSUS_Group *group)
 {
-  struct GNUNET_CONSENSUS_Handle *consensus;
-  consensus = (struct GNUNET_CONSENSUS_Handle *) cls;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "concluded\n");
+  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;
 }
 
-static void
+static int
 on_new_element (void *cls,
                 struct GNUNET_CONSENSUS_Element *element)
 {
-  struct GNUNET_CONSENSUS_Handle *consensus;
-
-  GNUNET_assert (NULL != element);
-
-  consensus = *(struct GNUNET_CONSENSUS_Handle **) cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received new element\n");
-
-  GNUNET_CONSENSUS_conclude (consensus, GNUNET_TIME_UNIT_FOREVER_REL, &conclude_done, consensus);
-
+  GNUNET_assert (0);
+  return GNUNET_YES;
 }
 
 static void
 insert_done (void *cls, int success)
 {
+  /* make sure cb is only called once */
+  static int called = GNUNET_NO;
+  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);
 }
 
 
+/**
+ * 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)
+{
+  if (NULL != consensus)
+  {
+    GNUNET_CONSENSUS_destroy (consensus);
+    consensus = NULL;
+  }
+}
+
 
 static void
 run (void *cls, 
@@ -83,20 +95,19 @@ run (void *cls,
   struct GNUNET_CONSENSUS_Element el2 = {"bar", 4, 0};
 
   GNUNET_log_setup ("test_consensus_api",
-                    "DEBUG",
+                    "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_CRYPTO_hash (str, strlen (str), &session_id);
-  consensus1 = GNUNET_CONSENSUS_create (cfg, 0, NULL, &session_id, on_new_element, &consensus1);
-  /*
-  consensus2 = GNUNET_CONSENSUS_create (cfg, 0, NULL, &session_id, on_new_element, &consensus2);
-  GNUNET_assert (consensus1 != NULL);
-  GNUNET_assert (consensus2 != NULL);
-  GNUNET_CONSENSUS_insert (consensus1, &el1, &insert_done, &consensus1);
-  GNUNET_CONSENSUS_insert (consensus2, &el2, &insert_done, &consensus2);
-  */
+  consensus = GNUNET_CONSENSUS_create (cfg, 0, NULL, &session_id, on_new_element, &consensus);
+  GNUNET_assert (consensus != NULL);
+
+  GNUNET_CONSENSUS_insert (consensus, &el1, NULL, &consensus);
+  GNUNET_CONSENSUS_insert (consensus, &el2, &insert_done, &consensus);
 }