From 9b586cd5f0f760c2e225368995296dfa884e4372 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 12 Jan 2020 01:03:08 +0100 Subject: fix ftbfs --- src/benchmark/taler-exchange-benchmark.c | 50 +++++++++++--------------------- 1 file changed, 17 insertions(+), 33 deletions(-) (limited to 'src/benchmark') diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index 3f687f00e..07ee26062 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -59,13 +59,12 @@ enum BenchmarkError #define FIRST_INSTRUCTION -1 #define CMD_TRANSFER_TO_EXCHANGE(label, amount) \ - TALER_TESTING_cmd_fakebank_transfer_retry \ - (TALER_TESTING_cmd_fakebank_transfer (label, amount, \ - user_bank_account.details. \ - x_taler_bank.account_base_url, \ - exchange_payto_url, \ - "dummy_user", \ - "dummy_password")) + TALER_TESTING_cmd_admin_add_incoming_retry \ + (TALER_TESTING_cmd_admin_add_incoming (label, amount, \ + exchange_bank_account.details. \ + x_taler_bank.account_base_url, \ + NULL, \ + user_payto_url)) /** @@ -98,7 +97,7 @@ static struct TALER_Account exchange_bank_account; /** * Hold information about a user at the bank. */ -static struct TALER_Account user_bank_account; +static char *user_payto_url; /** * Time snapshot taken right before executing the CMDs. @@ -821,32 +820,17 @@ main (int argc, return BAD_CLI_ARG; } + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_string + (cfg, + "benchmark", + "user-url", + &user_payto_url)) { - char *user_payto_url; - - if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string - (cfg, - "benchmark", - "user-url", - &user_payto_url)) - { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "benchmark", - "user-url"); - return BAD_CONFIG_FILE; - } - if (TALER_EC_NONE != - TALER_WIRE_payto_to_account (user_payto_url, - &user_bank_account)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _ ("Malformed payto:// URL `%s' in configuration\n"), - user_payto_url); - GNUNET_free (user_payto_url); - return BAD_CONFIG_FILE; - } - GNUNET_free (user_payto_url); + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "benchmark", + "user-url"); + return BAD_CONFIG_FILE; } { -- cgit v1.2.3