/*
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
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.
*/
/**
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "conclude over\n");
if (2 != elements_received)
- GNUNET_abort ();
+ GNUNET_assert (0);
GNUNET_SCHEDULER_shutdown ();
}
GNUNET_assert (GNUNET_NO == called);
called = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "insert done\n");
- GNUNET_CONSENSUS_conclude (consensus, GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_SECONDS), &conclude_done, NULL);
+ GNUNET_CONSENSUS_conclude (consensus, &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)
+on_shutdown (void *cls)
{
if (NULL != consensus)
{
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);
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);
}
-