diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:04:35 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:06:12 +0100 |
| commit | b6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch) | |
| tree | b29517e7aee281484ea960b92f53a6c13269904c /src/benchmark/taler-exchange-benchmark.c | |
| parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
| parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) | |
| download | exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.gz exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.bz2 exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.zip | |
fix merge conflict
Diffstat (limited to 'src/benchmark/taler-exchange-benchmark.c')
| -rw-r--r-- | src/benchmark/taler-exchange-benchmark.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index cd21507fd..a4249b36a 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -92,7 +92,7 @@ static struct TALER_TESTING_ExchangeConfiguration ec; /** * Hold information about a user at the bank. */ -static char *user_payto_url; +static char *user_payto_uri; /** * Time snapshot taken right before executing the CMDs. @@ -189,7 +189,7 @@ CMD_TRANSFER_TO_EXCHANGE (char *label, char *amount) (TALER_TESTING_cmd_admin_add_incoming (label, amount, &exchange_bank_account, - user_payto_url)); + user_payto_uri)); } @@ -322,12 +322,11 @@ run (void *cls, (TALER_TESTING_cmd_deposit ("deposit", withdraw_label, 0, /* Index of the one withdrawn coin in the traits. */ - user_payto_url, + user_payto_uri, order_enc, GNUNET_TIME_UNIT_ZERO, amount_1, MHD_HTTP_OK)); - if (eval_probability (refresh_rate / 100.0)) { char *melt_label; @@ -817,7 +816,7 @@ main (int argc, GNUNET_CONFIGURATION_get_value_string (cfg, "benchmark", "USER_PAYTO_URI", - &user_payto_url)) + &user_payto_uri)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "benchmark", |