-inlined peer destroy in testcase

diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 2ed3e1fa8232a02a3db0cfeeda8818fef428b48e..b1b9fb280be4c8b815c3886a77217362aaeca362 100644 (file)
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -21,7 +21,7 @@
 /**
  * @file testbed/test_testbed_api.c
  * @brief testcases for the testbed api
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura
  */
 
 #include "platform.h"
@@ -82,11 +82,6 @@ static struct GNUNET_TESTBED_Operation *operation;
  */
 static GNUNET_SCHEDULER_TaskIdentifier abort_task;
 
-/**
- * Peer destroy task identifier
- */
-static GNUNET_SCHEDULER_TaskIdentifier peer_destroy_task;
-
 /**
  * The testing result
  */
@@ -123,8 +118,6 @@ do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
   abort_task = GNUNET_SCHEDULER_NO_TASK;
-  if (GNUNET_SCHEDULER_NO_TASK != peer_destroy_task)
-    GNUNET_SCHEDULER_cancel (peer_destroy_task);
   do_shutdown (cls, tc);
 }
 
@@ -151,22 +144,6 @@ controller_cb(void *cls, const struct GNUNET_TESTBED_EventInformation *event)
 }
 
 
-/**
- * Task for destroying the peer
- *
- * @param cls NULL
- * @param tc the task context
- */
-static void
-do_peer_destroy (void *cls,
-                 const const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  peer_destroy_task = GNUNET_SCHEDULER_NO_TASK;
-  operation = GNUNET_TESTBED_peer_destroy (peer);
-  GNUNET_assert (NULL != operation);
-}
-
-
 /**
  * Callback which will be called to after a host registration succeeded or failed
  *
@@ -180,8 +157,8 @@ registration_comp (void *cls, const char *emsg)
   reg_handle = NULL;  
   peer = GNUNET_TESTBED_peer_create (controller, host, cfg);
   GNUNET_assert (NULL != peer);
-  peer_destroy_task = 
-    GNUNET_SCHEDULER_add_now (&do_peer_destroy, NULL);
+  operation = GNUNET_TESTBED_peer_destroy (peer);
+  GNUNET_assert (NULL != operation);
 }