diff options
author | t3sserakt <t3ss@posteo.de> | 2021-10-14 16:39:24 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-10-14 16:39:24 +0200 |
commit | d64ac269856744b9bab170964e1d6f36896ecc55 (patch) | |
tree | ed5aa79b91fe3cf9388433a5611581b7ce3b846c /src/include/gnunet_testing_ng_lib.h | |
parent | 003910fc614cd347919707d1bf3c37a939978459 (diff) | |
download | gnunet-d64ac269856744b9bab170964e1d6f36896ecc55.tar.gz gnunet-d64ac269856744b9bab170964e1d6f36896ecc55.zip |
removed versioned artefacts with v2 and v3. changes to reflect the changes in testing_api_loop.c
Diffstat (limited to 'src/include/gnunet_testing_ng_lib.h')
-rw-r--r-- | src/include/gnunet_testing_ng_lib.h | 86 |
1 files changed, 26 insertions, 60 deletions
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h index 0cab64504..adf5453e1 100644 --- a/src/include/gnunet_testing_ng_lib.h +++ b/src/include/gnunet_testing_ng_lib.h | |||
@@ -1054,40 +1054,12 @@ GNUNET_TESTING_cmd_system_destroy (const char *label, | |||
1054 | * Create command. | 1054 | * Create command. |
1055 | * | 1055 | * |
1056 | * @param label name for command. | 1056 | * @param label name for command. |
1057 | * @param local_m Number of local nodes in each namespace. | ||
1058 | * @param global_n The number of namespaces. | ||
1059 | * @return command. | ||
1060 | */ | ||
1061 | struct GNUNET_TESTING_Command | ||
1062 | GNUNET_TESTING_cmd_netjail_start (const char *label, | ||
1063 | char *local_m, | ||
1064 | char *global_n); | ||
1065 | |||
1066 | /** | ||
1067 | * Create command. | ||
1068 | * | ||
1069 | * @param label name for command. | ||
1070 | * @param topology_config Configuration file for the test topology. | 1057 | * @param topology_config Configuration file for the test topology. |
1071 | * @return command. | 1058 | * @return command. |
1072 | */ | 1059 | */ |
1073 | struct GNUNET_TESTING_Command | 1060 | struct GNUNET_TESTING_Command |
1074 | GNUNET_TESTING_cmd_netjail_start_v2 (const char *label, | 1061 | GNUNET_TESTING_cmd_netjail_start (const char *label, |
1075 | char *topology_config); | 1062 | char *topology_config); |
1076 | |||
1077 | |||
1078 | /** | ||
1079 | * Create command. | ||
1080 | * | ||
1081 | * @param label name for command. | ||
1082 | * @param binaryname to exec. | ||
1083 | * @return command. | ||
1084 | */ | ||
1085 | struct GNUNET_TESTING_Command | ||
1086 | GNUNET_TESTING_cmd_netjail_start_testing_system (const char *label, | ||
1087 | char *local_m, | ||
1088 | char *global_n, | ||
1089 | char *plugin_name, | ||
1090 | unsigned int *rv); | ||
1091 | 1063 | ||
1092 | 1064 | ||
1093 | /** | 1065 | /** |
@@ -1099,22 +1071,20 @@ GNUNET_TESTING_cmd_netjail_start_testing_system (const char *label, | |||
1099 | * @return command. | 1071 | * @return command. |
1100 | */ | 1072 | */ |
1101 | struct GNUNET_TESTING_Command | 1073 | struct GNUNET_TESTING_Command |
1102 | GNUNET_TESTING_cmd_netjail_start_testing_system_v2 (const char *label, | 1074 | GNUNET_TESTING_cmd_netjail_start_testing_system (const char *label, |
1103 | const char *topology_config, | 1075 | const char *topology_config); |
1104 | unsigned int *rv); | ||
1105 | 1076 | ||
1106 | 1077 | ||
1107 | /** | 1078 | /** |
1108 | * Create command. | 1079 | * Create command. |
1109 | * | 1080 | * |
1110 | * @param label name for command. | 1081 | * @param label name for command. |
1111 | * @param binaryname to stop. | 1082 | * @param topology_config Configuration file for the test topology. |
1112 | * @return command. | 1083 | * @return command. |
1113 | */ | 1084 | */ |
1114 | struct GNUNET_TESTING_Command | 1085 | struct GNUNET_TESTING_Command |
1115 | GNUNET_TESTING_cmd_netjail_stop (const char *label, | 1086 | GNUNET_TESTING_cmd_netjail_stop (const char *label, |
1116 | char *local_m, | 1087 | char *topology_config); |
1117 | char *global_n); | ||
1118 | 1088 | ||
1119 | 1089 | ||
1120 | /** | 1090 | /** |
@@ -1125,34 +1095,31 @@ GNUNET_TESTING_cmd_netjail_stop (const char *label, | |||
1125 | * @return command. | 1095 | * @return command. |
1126 | */ | 1096 | */ |
1127 | struct GNUNET_TESTING_Command | 1097 | struct GNUNET_TESTING_Command |
1128 | GNUNET_TESTING_cmd_netjail_stop_v2 (const char *label, | ||
1129 | char *topology_config); | ||
1130 | |||
1131 | |||
1132 | struct GNUNET_TESTING_Command | ||
1133 | GNUNET_TESTING_cmd_stop_testing_system (const char *label, | 1098 | GNUNET_TESTING_cmd_stop_testing_system (const char *label, |
1134 | const char *helper_start_label, | 1099 | const char *helper_start_label, |
1135 | char *local_m, | 1100 | const char *topology_config); |
1136 | char *global_n); | 1101 | |
1137 | 1102 | ||
1138 | /** | 1103 | /** |
1139 | * Create command. | 1104 | * Create a GNUNET_CMDS_LOCAL_FINISHED message. |
1140 | * | 1105 | * |
1141 | * @param label name for command. | 1106 | * @param rv The result of the local test as GNUNET_GenericReturnValue. |
1142 | * @param topology_config Configuration file for the test topology. | 1107 | * @return The GNUNET_CMDS_LOCAL_FINISHED message. |
1143 | * @return command. | 1108 | */ |
1144 | */ | 1109 | struct GNUNET_MessageHeader * |
1145 | struct GNUNET_TESTING_Command | 1110 | GNUNET_TESTING_send_local_test_finished_msg (enum GNUNET_GenericReturnValue rv); |
1146 | GNUNET_TESTING_cmd_stop_testing_system_v2 (const char *label, | ||
1147 | const char *helper_start_label, | ||
1148 | const char *topology_config); | ||
1149 | 1111 | ||
1150 | 1112 | ||
1151 | // FIXME: document! | 1113 | /** |
1152 | enum GNUNET_GenericReturnValue | 1114 | * Function to get the trait with the async context. |
1153 | GNUNET_TESTING_get_trait_helper_handles (const struct | 1115 | * |
1154 | GNUNET_TESTING_Command *cmd, | 1116 | * @param[out] ac GNUNET_TESTING_AsyncContext. |
1155 | struct GNUNET_HELPER_Handle ***helper); | 1117 | * @return #GNUNET_OK if no error occurred, #GNUNET_SYSERR otherwise. |
1118 | */ | ||
1119 | int | ||
1120 | GNUNET_TESTING_get_trait_async_context ( | ||
1121 | const struct GNUNET_TESTING_Command *cmd, | ||
1122 | struct GNUNET_TESTING_AsyncContext **ac); | ||
1156 | 1123 | ||
1157 | 1124 | ||
1158 | /** | 1125 | /** |
@@ -1163,7 +1130,7 @@ GNUNET_TESTING_get_trait_helper_handles (const struct | |||
1163 | * @return #GNUNET_OK on success. | 1130 | * @return #GNUNET_OK on success. |
1164 | */ | 1131 | */ |
1165 | enum GNUNET_GenericReturnValue | 1132 | enum GNUNET_GenericReturnValue |
1166 | GNUNET_TESTING_get_trait_helper_handles_v2 ( | 1133 | GNUNET_TESTING_get_trait_helper_handles ( |
1167 | const struct GNUNET_TESTING_Command *cmd, | 1134 | const struct GNUNET_TESTING_Command *cmd, |
1168 | struct GNUNET_HELPER_Handle ***helper); | 1135 | struct GNUNET_HELPER_Handle ***helper); |
1169 | 1136 | ||
@@ -1176,8 +1143,7 @@ GNUNET_TESTING_cmd_block_until_all_peers_started ( | |||
1176 | 1143 | ||
1177 | struct GNUNET_TESTING_Command | 1144 | struct GNUNET_TESTING_Command |
1178 | GNUNET_TESTING_cmd_block_until_external_trigger ( | 1145 | GNUNET_TESTING_cmd_block_until_external_trigger ( |
1179 | const char *label, | 1146 | const char *label); |
1180 | unsigned int *stop_blocking); | ||
1181 | 1147 | ||
1182 | struct GNUNET_TESTING_Command | 1148 | struct GNUNET_TESTING_Command |
1183 | GNUNET_TESTING_cmd_send_peer_ready (const char *label, | 1149 | GNUNET_TESTING_cmd_send_peer_ready (const char *label, |