Removed RunHandle return from GNUNET_TESTBED_run

1 files changed, 6 insertions, 21 deletions

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 37ffcb750..b8e0cf3f7 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -1114,12 +1114,6 @@ GNUNET_TESTBED_destroy (struct GNUNET_TESTBED_Testbed *testbed);
 
 
 /**
- * Opaque handle to testbed run
- */
-struct GNUNET_TESTBED_RunHandle;
-
-
-/**
  * Convenience method for running a testbed with
  * a single call.  Underlay and overlay topology
  * are configured using the "UNDERLAY" and "OVERLAY"
@@ -1127,7 +1121,8 @@ struct GNUNET_TESTBED_RunHandle;
  * (with possible options given in "UNDERLAY_XXX" and/or
  * "OVERLAY_XXX").
  *
- * The testbed is to be terminated using a calling GNUNET_TESTBED_shutdown_run()
+ * The testbed is to be terminated using a call to
+ * "GNUNET_SCHEDULER_shutdown".
  *
  * @param host_filename name of the file with the 'hosts', NULL
  *        to run everything on 'localhost'
@@ -1144,9 +1139,8 @@ struct GNUNET_TESTBED_RunHandle;
  * @param cc_cls closure for cc
  * @param master task to run once the testbed is ready
  * @param master_cls closure for 'task'.
- * @return the handle for this testbed run
  */
-struct GNUNET_TESTBED_RunHandle *
+void
 GNUNET_TESTBED_run (const char *host_filename,
                     const struct GNUNET_CONFIGURATION_Handle *cfg,
                     unsigned int num_peers,
@@ -1158,15 +1152,6 @@ GNUNET_TESTBED_run (const char *host_filename,
 
 
 /**
- * Stops the testbed run and releases any used resources
- *
- * @param rh the tesbed run handle
- */
-void
-GNUNET_TESTBED_shutdown_run (struct GNUNET_TESTBED_RunHandle *rh);
-
-
-/**
  * Signature of a main function for a testcase.
  * 
  * @param cls closure
@@ -1185,9 +1170,9 @@ typedef void (*GNUNET_TESTBED_TestMaster)(void *cls,
  * "[testbed]" section of the configuration (with possible options
  * given in "UNDERLAY_XXX" and/or "OVERLAY_XXX").
  *
- * The test is to be terminated by calling GNUNET_TESTBED_shutdown_run()
- * If starting the test fails, the program is stopped without 'master' ever
- * being run
+ * The test is to be terminated using a call to
+ * "GNUNET_SCHEDULER_shutdown".  If starting the test fails,
+ * the program is stopped without 'master' ever being run.
  *
  * NOTE: this function should be called from 'main', NOT from
  * within a GNUNET_SCHEDULER-loop.  This function will initialze