-clean up testing-NG finish logic

6 files changed, 52 insertions, 113 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;
+  }
 }
diff --git a/src/transport/transport_api_cmd_connecting_peers_v2.c b/src/transport/transport_api_cmd_connecting_peers_v2.c
index 8ef556946..8d0f74916 100644
--- a/src/transport/transport_api_cmd_connecting_peers_v2.c
+++ b/src/transport/transport_api_cmd_connecting_peers_v2.c
@@ -44,6 +44,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;
 
@@ -185,20 +190,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.
  *
  */
@@ -237,9 +228,8 @@ GNUNET_TRANSPORT_cmd_connect_peers_v2 (const char *label,
       .cls = cps,
       .label = label,
       .run = &connect_peers_run,
-      .finish = &connect_peers_finish,
-      .cleanup = &connect_peers_cleanup,
-      .traits = &connect_peers_traits
+      .ac = &cps->ac,
+      .cleanup = &connect_peers_cleanup
     };
 
     return cmd;
diff --git a/src/transport/transport_api_cmd_connecting_peers_v3.c b/src/transport/transport_api_cmd_connecting_peers_v3.c
index a73d81064..ae32a087a 100644
--- a/src/transport/transport_api_cmd_connecting_peers_v3.c
+++ b/src/transport/transport_api_cmd_connecting_peers_v3.c
@@ -59,6 +59,11 @@
 struct ConnectPeersState
 {
   /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
+  /**
    * The testing system of this node.
    */
   struct GNUNET_TESTING_System *tl_system;
@@ -448,20 +453,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.
  *
  */
@@ -475,13 +466,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_v3 (const char *label,
                                        const char *start_peer_label,
@@ -498,15 +482,15 @@ GNUNET_TRANSPORT_cmd_connect_peers_v3 (const char *label,
   cps->create_label = create_label;
   cps->topology = topology;
 
-
-  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;
+  }
 }
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index 8a53ed22c..44fc68807 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -51,6 +51,7 @@ hello_iter_cb (void *cb_cls,
                const char *emsg)
 {
   struct StartPeerState *sps = cb_cls;
+
   if (NULL == record)
   {
     sps->pic = NULL;
@@ -90,26 +91,6 @@ retrieve_hello (void *cls)
 
 
 /**
- * This function checks StartPeerState#finished, which is set when the hello was retrieved.
- *
- */
-static int
-start_peer_finish (void *cls,
-                   GNUNET_SCHEDULER_TaskCallback cont,
-                   void *cont_cls)
-{
-  struct StartPeerState *sps = cls;
-
-  if (GNUNET_YES == sps->finished)
-  {
-    cont (cont_cls);
-  }
-
-  return sps->finished;
-}
-
-
-/**
  * Disconnect callback for the connection to the core service.
  *
  */
@@ -597,14 +578,15 @@ GNUNET_TRANSPORT_cmd_start_peer (const char *label,
                    i * sizeof(struct GNUNET_MQ_MessageHandler));
   }
 
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = sps,
-    .label = label,
-    .run = &start_peer_run,
-    .finish = &start_peer_finish,
-    .cleanup = &start_peer_cleanup,
-    .traits = &start_peer_traits
-  };
-
-  return cmd;
+  {
+    struct GNUNET_TESTING_Command cmd = {
+      .cls = sps,
+      .label = label,
+      .run = &start_peer_run,
+      .cleanup = &start_peer_cleanup,
+      .traits = &start_peer_traits
+    };
+
+    return cmd;
+  }
 }
diff --git a/src/transport/transport_api_cmd_start_peer_v2.c b/src/transport/transport_api_cmd_start_peer_v2.c
index 2ab58574a..94799eddd 100644
--- a/src/transport/transport_api_cmd_start_peer_v2.c
+++ b/src/transport/transport_api_cmd_start_peer_v2.c
@@ -597,7 +597,6 @@ GNUNET_TRANSPORT_cmd_start_peer_v2 (const char *label,
     .cls = sps,
     .label = label,
     .run = &start_peer_run,
-    .finish = &start_peer_finish,
     .cleanup = &start_peer_cleanup,
     .traits = &start_peer_traits
   };
diff --git a/src/transport/transport_api_cmd_start_peer_v3.c b/src/transport/transport_api_cmd_start_peer_v3.c
index fa6300ef5..1a19ce60e 100644
--- a/src/transport/transport_api_cmd_start_peer_v3.c
+++ b/src/transport/transport_api_cmd_start_peer_v3.c
@@ -609,7 +609,6 @@ GNUNET_TRANSPORT_cmd_start_peer_v3 (const char *label,
     .cls = sps,
     .label = label,
     .run = &start_peer_run,
-    .finish = &start_peer_finish,
     .cleanup = &start_peer_cleanup,
     .traits = &start_peer_traits
   };