1 files changed, 17 insertions, 49 deletions

diff --git a/src/testing/testing_api_cmd_block_until_all_peers_started.c b/src/testing/testing_api_cmd_block_until_all_peers_started.c
index e9d3f0ed3..763713e15 100644
--- a/src/testing/testing_api_cmd_block_until_all_peers_started.c
+++ b/src/testing/testing_api_cmd_block_until_all_peers_started.c
@@ -39,6 +39,11 @@
 struct BlockState
 {
   /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
+  /**
    * Flag to indicate if all peers have started.
    *
    */
@@ -47,26 +52,11 @@ struct BlockState
 
 
 /**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-block_until_all_peers_started_traits (void *cls,
-                                      const void **ret,
-                                      const char *trait,
-                                      unsigned int index)
-{
-  return GNUNET_OK;
-}
-
-
-/**
  * The cleanup function of this cmd frees resources the cmd allocated.
  *
  */
 static void
-block_until_all_peers_started_cleanup (void *cls,
-                                       const struct GNUNET_TESTING_Command *cmd)
+block_until_all_peers_started_cleanup (void *cls)
 {
   struct BlockState *bs = cls;
 
@@ -80,7 +70,6 @@ block_until_all_peers_started_cleanup (void *cls,
  */
 static void
 block_until_all_peers_started_run (void *cls,
-                                   const struct GNUNET_TESTING_Command *cmd,
                                    struct GNUNET_TESTING_Interpreter *is)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -89,27 +78,6 @@ block_until_all_peers_started_run (void *cls,
 
 
 /**
- * Function to check if BlockState#all_peers_started is GNUNET_YES. In that case interpreter_next will be called.
- *
- */
-static int
-block_until_all_peers_started_finish (void *cls,
-                                      GNUNET_SCHEDULER_TaskCallback cont,
-                                      void *cont_cls)
-{
-  struct BlockState *bs = cls;
-  unsigned int *ret = bs->all_peers_started;
-
-  if (GNUNET_YES == *ret)
-  {
-    cont (cont_cls);
-  }
-
-  return *ret;
-}
-
-
-/**
  * Create command.
  *
  * @param label name for command.
@@ -125,15 +93,15 @@ GNUNET_TESTING_cmd_block_until_all_peers_started (const char *label,
 
   bs = GNUNET_new (struct BlockState);
   bs->all_peers_started = all_peers_started;
-
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = bs,
-    .label = label,
-    .run = &block_until_all_peers_started_run,
-    .finish = &block_until_all_peers_started_finish,
-    .cleanup = &block_until_all_peers_started_cleanup,
-    .traits = &block_until_all_peers_started_traits
-  };
-
-  return cmd;
+  {
+    struct GNUNET_TESTING_Command cmd = {
+      .cls = bs,
+      .label = label,
+      .run = &block_until_all_peers_started_run,
+      .ac = &bs->ac,
+      .cleanup = &block_until_all_peers_started_cleanup
+    };
+
+    return cmd;
+  }
 }