removed versioned artefacts with v2 and v3. changes to reflect the changes in testing_api_loop.c

1 files changed, 66 insertions, 135 deletions

diff --git a/src/transport/transport-testing-cmds.h b/src/transport/transport-testing-cmds.h
index ecdabd35f..f6e34df62 100644
--- a/src/transport/transport-testing-cmds.h
+++ b/src/transport/transport-testing-cmds.h
@@ -29,92 +29,71 @@
 #include "gnunet_testing_lib.h"
 
 
-struct StartPeerState_v2
+/**
+ * Struct to store information needed in callbacks.
+ *
+ */
+struct ConnectPeersState
 {
   /**
-   * The ip of a node.
-   */
-  char *node_ip;
-
-  /**
-   * Receive callback
+   * Context for our asynchronous completion.
    */
-  struct GNUNET_MQ_MessageHandler *handlers;
+  struct GNUNET_TESTING_AsyncContext ac;
 
-  const char *cfgname;
+  GNUNET_TRANSPORT_NotifyConnect notify_connect;
 
   /**
-   * Peer's configuration
+   * The testing system of this node.
    */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  struct GNUNET_TESTING_Peer *peer;
+  struct GNUNET_TESTING_System *tl_system;
 
-  /**
-   * Peer identity
-   */
-  struct GNUNET_PeerIdentity id;
+  // Label of the cmd which started the test system.
+  const char *create_label;
 
   /**
-   * Peer's transport service handle
+   * Number globally identifying the node.
+   *
    */
-  struct GNUNET_TRANSPORT_CoreHandle *th;
+  uint32_t num;
 
   /**
-   * Application handle
+   * Label of the cmd to start a peer.
+   *
    */
-  struct GNUNET_TRANSPORT_ApplicationHandle *ah;
+  const char *start_peer_label;
 
   /**
-   * Peer's PEERSTORE Handle
+   * The peer identity of this peer.
+   *
    */
-  struct GNUNET_PEERSTORE_Handle *ph;
+  struct GNUNET_PeerIdentity *id;
 
   /**
-   * Hello get task
+   * The topology of the test setup.
    */
-  struct GNUNET_SCHEDULER_Task *rh_task;
+  struct GNUNET_TESTING_NetjailTopology *topology;
 
   /**
-   * Peer's transport get hello handle to retrieve peer's HELLO message
+   * Connections to other peers.
    */
-  struct GNUNET_PEERSTORE_IterateContext *pic;
+  struct GNUNET_TESTING_NodeConnection *node_connections_head;
 
-  /**
-   * Hello
-   */
-  char *hello;
+  struct GNUNET_TESTING_Interpreter *is;
 
   /**
-   * Hello size
+   * Number of connections.
    */
-  size_t hello_size;
-
-  char *m;
-
-  char *n;
-
-  char *local_m;
-
-  unsigned int finished;
-
-  const char *system_label;
-
-  /**
-   * An unique number to identify the peer
-   */
-  unsigned int no;
-
-  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
-
-  struct GNUNET_TESTING_System *tl_system;
-
+  unsigned int con_num;
 };
 
-
 struct StartPeerState
 {
   /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
+  /**
    * The ip of a node.
    */
   char *node_ip;
@@ -179,8 +158,6 @@ struct StartPeerState
 
   char *local_m;
 
-  unsigned int finished;
-
   const char *system_label;
 
   /**
@@ -192,9 +169,24 @@ struct StartPeerState
 
   struct GNUNET_TESTING_System *tl_system;
 
+  GNUNET_TRANSPORT_NotifyConnect notify_connect;
+
 };
 
 
+/**
+ * Function to get the trait with the struct ConnectPeersState.
+ *
+ * @param[out] sps struct ConnectPeersState.
+ * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise.
+ *
+ */
+int
+GNUNET_TESTING_get_trait_connect_peer_state (
+  const struct GNUNET_TESTING_Command *cmd,
+  struct ConnectPeersState **cps);
+
+
 int
 GNUNET_TRANSPORT_get_trait_state (const struct
                                   GNUNET_TESTING_Command
@@ -203,61 +195,28 @@ GNUNET_TRANSPORT_get_trait_state (const struct
 
 
 struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_start_peer_v2 (const char *label,
-                                    const char *system_label,
-                                    uint32_t no,
-                                    char *node_ip,
-                                    struct GNUNET_MQ_MessageHandler *handlers,
-                                    const char *cfgname);
-
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_start_peer_v3 (const char *label,
-                                    const char *system_label,
-                                    uint32_t no,
-                                    char *node_ip,
-                                    struct GNUNET_MQ_MessageHandler *handlers,
-                                    const char *cfgname);
-
-struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_start_peer (const char *label,
                                  const char *system_label,
-                                 char *m,
-                                 char *n,
-                                 char *local_m,
+                                 uint32_t no,
                                  char *node_ip,
                                  struct GNUNET_MQ_MessageHandler *handlers,
-                                 const char *cfgname);
+                                 const char *cfgname,
+                                 GNUNET_TRANSPORT_NotifyConnect notify_connect);
+
 
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_stop_peer (const char *label,
                                 const char *start_label);
 
+
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
                                     const char *start_peer_label,
                                     const char *create_label,
-                                    uint32_t num);
-
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_connect_peers_v2 (const char *label,
-                                       const char *start_peer_label,
-                                       const char *create_label,
-                                       uint32_t num);
-
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_connect_peers_v3 (const char *label,
-                                       const char *start_peer_label,
-                                       const char *create_label,
-                                       uint32_t num,
-                                       struct GNUNET_TESTING_NetjailTopology *
-                                       topology);
+                                    uint32_t num,
+                                    struct GNUNET_TESTING_NetjailTopology *
+                                    topology);
 
-struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_send_simple (const char *label,
-                                  char *m,
-                                  char *n,
-                                  uint32_t num,
-                                  const char *start_peer_label);
 
 /**
  * Create command.
@@ -270,43 +229,29 @@ GNUNET_TRANSPORT_cmd_send_simple (const char *label,
  * @return command.
  */
 struct GNUNET_TESTING_Command
-GNUNET_TRANSPORT_cmd_send_simple_v2 (const char *label,
-                                     const char *start_peer_label,
-                                     uint32_t num);
+GNUNET_TRANSPORT_cmd_send_simple (const char *label,
+                                  const char *start_peer_label,
+                                  uint32_t num);
+
+
+
+
 
 int
 GNUNET_TRANSPORT_get_trait_peer_id (const struct
                                     GNUNET_TESTING_Command *cmd,
                                     struct GNUNET_PeerIdentity **id);
 
+
 int
 GNUNET_TRANSPORT_get_trait_connected_peers_map (const struct
                                                 GNUNET_TESTING_Command
                                                 *cmd,
                                                 struct
-                                                GNUNET_CONTAINER_MultiShortmap *
+                                                GNUNET_CONTAINER_MultiShortmap
+                                                *
                                                 *
                                                 connected_peers_map);
-
-int
-GNUNET_TRANSPORT_get_trait_connected_peers_map_v2 (const struct
-                                                   GNUNET_TESTING_Command
-                                                   *cmd,
-                                                   struct
-                                                   GNUNET_CONTAINER_MultiShortmap
-                                                   *
-                                                   *
-                                                   connected_peers_map);
-
-int
-GNUNET_TRANSPORT_get_trait_connected_peers_map_v3 (const struct
-                                                   GNUNET_TESTING_Command
-                                                   *cmd,
-                                                   struct
-                                                   GNUNET_CONTAINER_MultiShortmap
-                                                   *
-                                                   *
-                                                   connected_peers_map);
 int
 GNUNET_TRANSPORT_get_trait_hello_size (const struct
                                        GNUNET_TESTING_Command
@@ -327,19 +272,5 @@ GNUNET_TRANSPORT_get_trait_application_handle (const struct
                                                GNUNET_TRANSPORT_ApplicationHandle
                                                **ah);
 
-int
-GNUNET_TRANSPORT_get_trait_application_handle_v2 (const struct
-                                                  GNUNET_TESTING_Command *cmd,
-                                                  struct
-                                                  GNUNET_TRANSPORT_ApplicationHandle
-                                                  **ah);
-
-int
-GNUNET_TRANSPORT_get_trait_application_handle_v3 (const struct
-                                                  GNUNET_TESTING_Command *cmd,
-                                                  struct
-                                                  GNUNET_TRANSPORT_ApplicationHandle
-                                                  **ah);
-
 #endif
 /* end of transport_testing.h */