/*
This file is part of GNUnet.
- (C) 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010, 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.
*/
/**
* @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
#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 sched scheduler to use
- * @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
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched,
- 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);
-
-
-/**
- * Connect two daemons for testing.
- *
- * @param sched scheduler to use
- * @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
- */
-void
-GNUNET_FS_TEST_daemons_connect (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon1,
- struct GNUNET_FS_TestDaemon *daemon2,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls);
-
-
-/**
- * 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);
-
-
-
-/**
- * Stop daemons used for testing.
- *
- * @param sched scheduler to use
- * @param total number of daemons to stop
- * @param daemons array with the daemons (values will be clobbered)
- */
-void
-GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched,
- unsigned int total,
- struct GNUNET_FS_TestDaemon **daemons);
+#include "gnunet_testbed_service.h"
/**
*
* @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);
+typedef void
+(*GNUNET_FS_TEST_UriContinuation) (void *cls,
+ const struct GNUNET_FS_Uri *uri,
+ const char *fn);
/**
* Publish a file at the given daemon.
*
- * @param sched scheduler to use
- * @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
- * @param do_index GNUNET_YES for index, GNUNET_NO for insertion,
- * GNUNET_SYSERR for simulation
+ * @param do_index #GNUNET_YES for index, #GNUNET_NO for insertion,
+ * #GNUNET_SYSERR for simulation
* @param size size of the file to publish
* @param seed seed to use for file generation
* @param verbose how verbose to be in reporting
* @param cont function to call when done
- * @param cont_cls closure for cont
+ * @param cont_cls closure for @a cont
*/
void
-GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
- struct GNUNET_TIME_Relative timeout,
- uint32_t anonymity,
- int do_index,
- uint64_t size,
- uint32_t seed,
- unsigned int verbose,
- GNUNET_FS_TEST_UriContinuation cont,
- void *cont_cls);
+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,
+ GNUNET_FS_TEST_UriContinuation cont,
+ void *cont_cls);
/**
* Perform test download.
*
- * @param sched scheduler to use
- * @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
* @param uri URI of file to download (CHK/LOC only)
* @param verbose how verbose to be in reporting
* @param cont function to call when done
- * @param cont_cls closure for cont
+ * @param cont_cls closure for @a cont
*/
void
-GNUNET_FS_TEST_download (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
- struct GNUNET_TIME_Relative timeout,
- uint32_t anonymity,
- uint32_t seed,
- const struct GNUNET_FS_Uri *uri,
- unsigned int verbose,
- GNUNET_SCHEDULER_Task cont,
- void *cont_cls);
+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,
+ GNUNET_SCHEDULER_TaskCallback cont,
+ void *cont_cls);