diff options
Diffstat (limited to 'src/merchant-tools/taler-merchant-benchmark.c')
| -rw-r--r-- | src/merchant-tools/taler-merchant-benchmark.c | 66 |
1 files changed, 3 insertions, 63 deletions
diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c index 09c2ba6a..ec3319cf 100644 --- a/src/merchant-tools/taler-merchant-benchmark.c +++ b/src/merchant-tools/taler-merchant-benchmark.c @@ -24,15 +24,7 @@ */ #include "platform.h" #include <taler/taler_util.h> -#include <taler/taler_signatures.h> -#include <taler/taler_exchange_service.h> -#include <taler/taler_json_lib.h> -#include <gnunet/gnunet_util_lib.h> -#include <microhttpd.h> -#include <taler/taler_bank_service.h> -#include <taler/taler_fakebank_lib.h> #include <taler/taler_testing_lib.h> -#include <taler/taler_error_codes.h> #include "taler_merchant_testing_lib.h" @@ -90,11 +82,6 @@ static unsigned int twocoins_number = 1; static unsigned int payments_number = 1; /** - * How many /tracks operation we want to perform. - */ -static unsigned int tracks_number = 1; - -/** * Config filename to give to commands (like wirewatch). */ static char *cfg_filename; @@ -198,6 +185,7 @@ run (void *cls, cred.user42_payto, currency, MHD_HTTP_NO_CONTENT), + TALER_TESTING_cmd_admin_add_incoming ( "create-reserve-1", CURRENCY_10_02, @@ -241,55 +229,13 @@ run (void *cls, "rewind-payments", "create-reserve-1", payments_number), - /* Next proposal-pay cycle will be used by /track CMDs - * and so it will not have to be looped over, only /track - * CMDs will have to. */ - TALER_TESTING_cmd_merchant_post_orders ( - "create-proposal-2", - cred.cfg, - merchant_url, - MHD_HTTP_OK, - NULL, /* random order ID */ - GNUNET_TIME_UNIT_ZERO_TS, - GNUNET_TIME_UNIT_FOREVER_TS, - CURRENCY_5), - 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, - NULL), - /* /track/transaction over deposit-simple-2 */ - TALER_TESTING_cmd_exec_aggregator ( - "aggregate-1", + "aggregate-1x", cfg_filename), TALER_TESTING_cmd_exec_transfer ( "transfer-1", cfg_filename), - TALER_TESTING_cmd_merchant_post_transfer ( - "post-transfer-1", - &cred.ba, - cred.user42_payto, - merchant_url, - CURRENCY_4_98, - MHD_HTTP_OK, - "deposit-simple-2", - NULL), - TALER_TESTING_cmd_merchant_get_transfers ( - "track-transfer-1", - merchant_url, - cred.user42_payto, - MHD_HTTP_OK, - "post-transfer-1", - NULL), - TALER_TESTING_cmd_rewind_ip ( - "rewind-tracks", - "track-transfer-1", - tracks_number), + TALER_TESTING_cmd_end () }; @@ -538,12 +484,6 @@ main (int argc, "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_version (PACKAGE_VERSION "-" VCS_VERSION), GNUNET_GETOPT_OPTION_END }; |