fix benchmark FTBFS

1 files changed, 150 insertions, 204 deletions

diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c
index 204ab870..5cc9cc2a 100644
--- a/src/merchant-tools/taler-merchant-benchmark.c
+++ b/src/merchant-tools/taler-merchant-benchmark.c
@@ -348,14 +348,13 @@ run (void *cls,
                                             merchant_url,
                                             MHD_HTTP_OK,
                                             order_worth_5),
-    TALER_TESTING_cmd_pay ("deposit-simple",
-                           merchant_url,
-                           MHD_HTTP_OK,
-                           "create-proposal-1",
-                           "withdraw-coin-1",
-                           CURRENCY_5,
-                           CURRENCY_4_99,
-                           CURRENCY_0_01),
+    TALER_TESTING_cmd_merchant_pay_order ("deposit-simple",
+                                          merchant_url,
+                                          MHD_HTTP_OK,
+                                          "create-proposal-1",
+                                          "withdraw-coin-1",
+                                          CURRENCY_5,
+                                          CURRENCY_4_99),
     TALER_TESTING_cmd_rewind_ip ("rewind-payments",
                                  FIRST_INSTRUCTION,
                                  &payments_number),
@@ -366,14 +365,13 @@ run (void *cls,
                                             merchant_url,
                                             MHD_HTTP_OK,
                                             order_worth_5_track),
-    TALER_TESTING_cmd_pay ("deposit-simple-2",
-                           merchant_url,
-                           MHD_HTTP_OK,
-                           "create-proposal-2",
-                           "withdraw-coin-2",
-                           CURRENCY_5,
-                           CURRENCY_4_99,
-                           CURRENCY_0_01),
+    TALER_TESTING_cmd_merchant_pay_order ("deposit-simple-2",
+                                          merchant_url,
+                                          MHD_HTTP_OK,
+                                          "create-proposal-2",
+                                          "withdraw-coin-2",
+                                          CURRENCY_5,
+                                          CURRENCY_4_99),
     /* /track/transaction over deposit-simple-2 */
 
     TALER_TESTING_cmd_exec_aggregator ("aggregate-1",
@@ -393,91 +391,60 @@ run (void *cls,
   };
 
   struct TALER_TESTING_Command corner_commands[] = {
-
-    TALER_TESTING_cmd_admin_add_incoming
-      ("create-reserve-1",
-      CURRENCY_5_01,
-      &auth,
-      customer_payto),
-
-    TALER_TESTING_cmd_exec_wirewatch
-      ("wirewatch-1",
-      cfg_filename),
-
-    TALER_TESTING_cmd_withdraw_amount
-      ("withdraw-coin-1",
-      "create-reserve-1",
-      CURRENCY_5,
-      MHD_HTTP_OK),
-
-    TALER_TESTING_cmd_merchant_post_orders
-      ("create-unaggregated-proposal",
-      alt_instance_url,
-      MHD_HTTP_OK,
-      order_worth_5_unaggregated),
-
-    TALER_TESTING_cmd_pay
-      ("deposit-unaggregated",
-      merchant_url,
-      MHD_HTTP_OK,
-      "create-unaggregated-proposal",
-      "withdraw-coin-1",
-      CURRENCY_5,
-      CURRENCY_4_99,
-      CURRENCY_0_01),
-
-    TALER_TESTING_cmd_rewind_ip
-      ("rewind-unaggregated",
-      FIRST_INSTRUCTION,
-      &unaggregated_number),
-
-    TALER_TESTING_cmd_admin_add_incoming
-      ("create-reserve-2",
-      CURRENCY_10_02,
-      &auth,
-      customer_payto),
-
-    TALER_TESTING_cmd_exec_wirewatch
-      ("wirewatch-2",
-      cfg_filename),
-
-    TALER_TESTING_cmd_withdraw_amount
-      ("withdraw-coin-2",
-      "create-reserve-2",
-      CURRENCY_5,
-      MHD_HTTP_OK),
-
-    TALER_TESTING_cmd_withdraw_amount
-      ("withdraw-coin-3",
-      "create-reserve-2",
-      CURRENCY_5,
-      MHD_HTTP_OK),
-
-    TALER_TESTING_cmd_merchant_post_orders
-      ("create-twocoins-proposal",
-      merchant_url,
-      MHD_HTTP_OK,
-      order_worth_10_2coins),
-
-    TALER_TESTING_cmd_pay
-      ("deposit-twocoins",
-      merchant_url,
-      MHD_HTTP_OK,
-      "create-twocoins-proposal",
-      "withdraw-coin-2;withdraw-coin-3",
-      CURRENCY_10,
-      CURRENCY_9_98,
-      CURRENCY_0_02),
-
-    TALER_TESTING_cmd_exec_aggregator
-      ("aggregate-twocoins",
-      cfg_filename),
-
-    TALER_TESTING_cmd_rewind_ip
-      ("rewind-twocoins",
-      TWOCOINS_INSTRUCTION,
-      &twocoins_number),
-
+    TALER_TESTING_cmd_admin_add_incoming ("create-reserve-1",
+                                          CURRENCY_5_01,
+                                          &auth,
+                                          customer_payto),
+    TALER_TESTING_cmd_exec_wirewatch ("wirewatch-1",
+                                      cfg_filename),
+    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1",
+                                       "create-reserve-1",
+                                       CURRENCY_5,
+                                       MHD_HTTP_OK),
+    TALER_TESTING_cmd_merchant_post_orders ("create-unaggregated-proposal",
+                                            alt_instance_url,
+                                            MHD_HTTP_OK,
+                                            order_worth_5_unaggregated),
+    TALER_TESTING_cmd_merchant_pay_order ("deposit-unaggregated",
+                                          merchant_url,
+                                          MHD_HTTP_OK,
+                                          "create-unaggregated-proposal",
+                                          "withdraw-coin-1",
+                                          CURRENCY_5,
+                                          CURRENCY_4_99),
+    TALER_TESTING_cmd_rewind_ip ("rewind-unaggregated",
+                                 FIRST_INSTRUCTION,
+                                 &unaggregated_number),
+    TALER_TESTING_cmd_admin_add_incoming ("create-reserve-2",
+                                          CURRENCY_10_02,
+                                          &auth,
+                                          customer_payto),
+    TALER_TESTING_cmd_exec_wirewatch ("wirewatch-2",
+                                      cfg_filename),
+    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-2",
+                                       "create-reserve-2",
+                                       CURRENCY_5,
+                                       MHD_HTTP_OK),
+    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-3",
+                                       "create-reserve-2",
+                                       CURRENCY_5,
+                                       MHD_HTTP_OK),
+    TALER_TESTING_cmd_merchant_post_orders ("create-twocoins-proposal",
+                                            merchant_url,
+                                            MHD_HTTP_OK,
+                                            order_worth_10_2coins),
+    TALER_TESTING_cmd_merchant_pay_order ("deposit-twocoins",
+                                          merchant_url,
+                                          MHD_HTTP_OK,
+                                          "create-twocoins-proposal",
+                                          "withdraw-coin-2;withdraw-coin-3",
+                                          CURRENCY_10,
+                                          CURRENCY_9_98),
+    TALER_TESTING_cmd_exec_aggregator ("aggregate-twocoins",
+                                       cfg_filename),
+    TALER_TESTING_cmd_rewind_ip ("rewind-twocoins",
+                                 TWOCOINS_INSTRUCTION,
+                                 &twocoins_number),
     TALER_TESTING_cmd_end ()
   };
 
@@ -531,127 +498,106 @@ main (int argc,
 {
   struct GNUNET_GETOPT_CommandLineOption *options;
   struct GNUNET_GETOPT_CommandLineOption root_options[] = {
-    GNUNET_GETOPT_option_cfgfile
-      (&cfg_filename),
-    GNUNET_GETOPT_option_version
-      (PACKAGE_VERSION " " VCS_VERSION),
-    GNUNET_GETOPT_option_flag
-      ('h',
-      "help",
-      NULL,
-      &root_help),
+    GNUNET_GETOPT_option_cfgfile (&cfg_filename),
+    GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION),
+    GNUNET_GETOPT_option_flag ('h',
+                               "help",
+                               NULL,
+                               &root_help),
     GNUNET_GETOPT_OPTION_END
   };
-
   struct GNUNET_GETOPT_CommandLineOption corner_options[] = {
-    GNUNET_GETOPT_option_help
-      ("Populate databases with corner case payments"),
-    GNUNET_GETOPT_option_loglevel
-      (&loglev),
-    GNUNET_GETOPT_option_uint
-      ('u',
-      "unaggregated-number",
-      "UN",
-      "will generate UN unaggregated payments, defaults to 1",
-      &unaggregated_number),
-    GNUNET_GETOPT_option_uint
-      ('t',
-      "two-coins",
-      "TC",
-      "will perform TC 2-coins payments, defaults to 1",
-      &twocoins_number),
+    GNUNET_GETOPT_option_help ("Populate databases with corner case payments"),
+    GNUNET_GETOPT_option_loglevel (&loglev),
+    GNUNET_GETOPT_option_uint ('u',
+                               "unaggregated-number",
+                               "UN",
+                               "will generate UN unaggregated payments, defaults to 1",
+                               &unaggregated_number),
+    GNUNET_GETOPT_option_uint ('t',
+                               "two-coins",
+                               "TC",
+                               "will perform TC 2-coins payments, defaults to 1",
+                               &twocoins_number),
     /**
      * NOTE: useful when the setup serves merchant
      * backends via unix domain sockets, since there
      * is no way - yet? - to get the merchant base url.
      * Clearly, we could introduce a merchant_base_url
      * value into the configuration.
-     */GNUNET_GETOPT_option_string
-      ('m',
-      "merchant-url",
-      "MU",
-      "merchant base url, mandatory",
-      &merchant_url),
-    GNUNET_GETOPT_option_string
-      ('k',
-      "currency",
-      "K",
-      "Used currency, mandatory",
-      &currency),
-    GNUNET_GETOPT_option_string
-      ('i',
-      "alt-instance",
-      "AI",
-      "alternative (non default) instance,"
-      " used to provide fresh wire details to"
-      " make unaggregated transactions stay so."
-      " Note, this instance will be given far"
-      " future wire deadline, and so it should"
-      " never author now-deadlined transactions,"
-      " as they would get those far future ones"
-      " aggregated too.",
-      &alt_instance_id),
-    GNUNET_GETOPT_option_string
-      ('b',
-      "bank-url",
-      "BU",
-      "bank base url, mandatory",
-      &bank_url),
-    GNUNET_GETOPT_option_string
-      ('l',
-      "logfile",
-      "LF",
-      "will log to file LF",
-      &logfile),
+     *///
+    GNUNET_GETOPT_option_string ('m',
+                                 "merchant-url",
+                                 "MU",
+                                 "merchant base url, mandatory",
+                                 &merchant_url),
+    GNUNET_GETOPT_option_string ('k',
+                                 "currency",
+                                 "K",
+                                 "Used currency, mandatory",
+                                 &currency),
+    GNUNET_GETOPT_option_string ('i',
+                                 "alt-instance",
+                                 "AI",
+                                 "alternative (non default) instance,"
+                                 " used to provide fresh wire details to"
+                                 " make unaggregated transactions stay so."
+                                 " Note, this instance will be given far"
+                                 " future wire deadline, and so it should"
+                                 " never author now-deadlined transactions,"
+                                 " as they would get those far future ones"
+                                 " aggregated too.",
+                                 &alt_instance_id),
+    GNUNET_GETOPT_option_string ('b',
+                                 "bank-url",
+                                 "BU",
+                                 "bank base url, mandatory",
+                                 &bank_url),
+    GNUNET_GETOPT_option_string ('l',
+                                 "logfile",
+                                 "LF",
+                                 "will log to file LF",
+                                 &logfile),
     GNUNET_GETOPT_OPTION_END
   };
-
   struct GNUNET_GETOPT_CommandLineOption ordinary_options[] = {
-    GNUNET_GETOPT_option_cfgfile
-      (&cfg_filename),
-    GNUNET_GETOPT_option_version
-      (PACKAGE_VERSION " " VCS_VERSION),
-    GNUNET_GETOPT_option_help
-      ("Generate Taler ordinary payments"
-      " to populate the databases"),
-    GNUNET_GETOPT_option_loglevel
-      (&loglev),
-    GNUNET_GETOPT_option_uint
-      ('p',
-      "payments-number",
-      "PN",
-      "will generate PN payments, defaults to 1",
-      &payments_number),
-    GNUNET_GETOPT_option_uint
-      ('t',
-      "tracks-number",
-      "TN",
-      "will perform TN /track operations, defaults to 1",
-      &tracks_number),
+    GNUNET_GETOPT_option_cfgfile (&cfg_filename),
+    GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION),
+    GNUNET_GETOPT_option_help ("Generate Taler ordinary payments"
+                               " to populate the databases"),
+    GNUNET_GETOPT_option_loglevel (&loglev),
+    GNUNET_GETOPT_option_uint ('p',
+                               "payments-number",
+                               "PN",
+                               "will generate PN payments, defaults to 1",
+                               &payments_number),
+    GNUNET_GETOPT_option_uint ('t',
+                               "tracks-number",
+                               "TN",
+                               "will perform TN /track operations, defaults to 1",
+                               &tracks_number),
     /**
      * NOTE: useful when the setup serves merchant
      * backends via unix domain sockets, since there
      * is no way - yet? - to get the merchant base url.
      * Clearly, we could introduce a merchant_base_url
      * value into the configuration.
-     */GNUNET_GETOPT_option_string
-      ('m',
-      "merchant-url",
-      "MU",
-      "merchant base url, mandatory",
-      &merchant_url),
-    GNUNET_GETOPT_option_string
-      ('b',
-      "bank-url",
-      "BU",
-      "bank base url, mandatory",
-      &bank_url),
-    GNUNET_GETOPT_option_string
-      ('l',
-      "logfile",
-      "LF",
-      "will log to file LF",
-      &logfile),
+     *///
+    GNUNET_GETOPT_option_string ('m',
+                                 "merchant-url",
+                                 "MU",
+                                 "merchant base url, mandatory",
+                                 &merchant_url),
+    GNUNET_GETOPT_option_string ('b',
+                                 "bank-url",
+                                 "BU",
+                                 "bank base url, mandatory",
+                                 &bank_url),
+    GNUNET_GETOPT_option_string ('l',
+                                 "logfile",
+                                 "LF",
+                                 "will log to file LF",
+                                 &logfile),
     GNUNET_GETOPT_OPTION_END
   };