1 files changed, 17 insertions, 32 deletions

diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index ddf1c3872..82194ff15 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -42,6 +42,11 @@
  */
 struct ConnectPeersState
 {
+  /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
   // Label of the cmd which started the test system.
   const char *create_label;
 
@@ -183,6 +188,7 @@ connect_peers_run (void *cls,
  * The finish function of this cmd will check if the peer we are trying to connect to is in the connected peers map of the start peer cmd for this peer.
  *
  */
+// FIXME: this needs a complete rewrite!
 static int
 connect_peers_finish (void *cls,
                       GNUNET_SCHEDULER_TaskCallback cont,
@@ -222,20 +228,6 @@ connect_peers_finish (void *cls,
 
 
 /**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-connect_peers_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.
  *
  */
@@ -249,13 +241,6 @@ connect_peers_cleanup (void *cls)
 }
 
 
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_peer_label Label of the cmd to start a peer.
- * @return command.
- */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
                                     const char *start_peer_label,
@@ -269,15 +254,15 @@ GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
   cps->num = num;
   cps->create_label = create_label;
 
-
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = cps,
-    .label = label,
-    .run = &connect_peers_run,
-    .finish = &connect_peers_finish,
-    .cleanup = &connect_peers_cleanup,
-    .traits = &connect_peers_traits
-  };
-
-  return cmd;
+  {
+    struct GNUNET_TESTING_Command cmd = {
+      .cls = cps,
+      .label = label,
+      .run = &connect_peers_run,
+      .ac = &cps->ac,
+      .cleanup = &connect_peers_cleanup
+    };
+
+    return cmd;
+  }
 }