diff options
Diffstat (limited to 'src/fs/fs_test_lib.h')
| -rw-r--r-- | src/fs/fs_test_lib.h | 111 |
1 files changed, 12 insertions, 99 deletions
diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index 81125ca..679e074 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2010 Christian Grothoff (and other contributing authors) + (C) 2010, 2012 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -20,8 +20,8 @@ /** * @file fs/fs_test_lib.h - * @brief library routines for testing FS publishing and downloading - * with multiple peers; this code is limited to flat files + * @brief library routines for testing FS publishing and downloading; + * this code is limited to flat files * and no keywords (those functions can be tested with * single-peer setups; this is for testing routing). * @author Christian Grothoff @@ -31,97 +31,7 @@ #include "gnunet_util_lib.h" #include "gnunet_fs_service.h" - -/** - * Handle for a daemon started for testing FS. - */ -struct GNUNET_FS_TestDaemon; - - -/** - * Start daemons for testing. - * - * @param template_cfg_file configuration template to use - * @param timeout if this operation cannot be completed within the - * given period, call the continuation with an error code - * @param total number of daemons to start - * @param daemons array of 'total' entries to be initialized - * (array must already be allocated, will be filled) - * @param cont function to call when done; note that if 'cont' - * is called with reason "TIMEOUT", then starting the - * daemons has failed and the client MUST NOT call - * 'GNUNET_FS_TEST_daemons_stop'! - * @param cont_cls closure for cont - */ -void -GNUNET_FS_TEST_daemons_start (const char *template_cfg_file, - struct GNUNET_TIME_Relative timeout, - unsigned int total, - struct GNUNET_FS_TestDaemon **daemons, - GNUNET_SCHEDULER_Task cont, void *cont_cls); - - -struct GNUNET_FS_TEST_ConnectContext; - - -/** - * Connect two daemons for testing. - * - * @param daemon1 first daemon to connect - * @param daemon2 second first daemon to connect - * @param timeout if this operation cannot be completed within the - * given period, call the continuation with an error code - * @param cont function to call when done - * @param cont_cls closure for cont - */ -struct GNUNET_FS_TEST_ConnectContext * -GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1, - struct GNUNET_FS_TestDaemon *daemon2, - struct GNUNET_TIME_Relative timeout, - GNUNET_SCHEDULER_Task cont, void *cont_cls); - - -/** - * Cancel connect operation. - * - * @param cc operation to cancel - */ -void -GNUNET_FS_TEST_daemons_connect_cancel (struct GNUNET_FS_TEST_ConnectContext - *cc); - - -/** - * Obtain peer group used for testing. - * - * @param daemons array with the daemons (must contain at least one) - * @return peer group - */ -struct GNUNET_TESTING_PeerGroup * -GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons); - - - -/** - * Obtain peer configuration used for testing. - * - * @param daemons array with the daemons - * @param off which configuration to get - * @return peer configuration - */ -const struct GNUNET_CONFIGURATION_Handle * -GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons, - unsigned int off); - -/** - * Stop daemons used for testing. - * - * @param total number of daemons to stop - * @param daemons array with the daemons (values will be clobbered) - */ -void -GNUNET_FS_TEST_daemons_stop (unsigned int total, - struct GNUNET_FS_TestDaemon **daemons); +#include "gnunet_testbed_service.h" /** @@ -129,16 +39,19 @@ GNUNET_FS_TEST_daemons_stop (unsigned int total, * * @param cls closure (user defined) * @param uri a URI, NULL for errors + * @param fn name of the file on disk to be removed upon + * completion, or NULL for inserted files (also NULL on error) */ typedef void (*GNUNET_FS_TEST_UriContinuation) (void *cls, const struct GNUNET_FS_Uri * - uri); + uri, + const char *fn); /** * Publish a file at the given daemon. * - * @param daemon where to publish + * @param peer where to publish * @param timeout if this operation cannot be completed within the * given period, call the continuation with an error code * @param anonymity option for publication @@ -151,7 +64,7 @@ typedef void (*GNUNET_FS_TEST_UriContinuation) (void *cls, * @param cont_cls closure for cont */ void -GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon, +GNUNET_FS_TEST_publish (struct GNUNET_TESTBED_Peer *peer, struct GNUNET_TIME_Relative timeout, uint32_t anonymity, int do_index, uint64_t size, uint32_t seed, unsigned int verbose, @@ -161,7 +74,7 @@ GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon, /** * Perform test download. * - * @param daemon which peer to download from + * @param peer which peer to download from * @param timeout if this operation cannot be completed within the * given period, call the continuation with an error code * @param anonymity option for download @@ -172,7 +85,7 @@ GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon, * @param cont_cls closure for cont */ void -GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon, +GNUNET_FS_TEST_download (struct GNUNET_TESTBED_Peer *peer, struct GNUNET_TIME_Relative timeout, uint32_t anonymity, uint32_t seed, const struct GNUNET_FS_Uri *uri, unsigned int verbose, |