summaryrefslogtreecommitdiff
path: root/src/benchmark
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-01-19 17:04:35 +0100
committerChristian Grothoff <christian@grothoff.org>2020-01-19 17:06:12 +0100
commitb6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch)
treeb29517e7aee281484ea960b92f53a6c13269904c /src/benchmark
parent707449aa8f1a84d453a302b245dd4e076d93171a (diff)
parentfc8bdb9b978334d52b80c318f9326394f855de2d (diff)
downloadexchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.gz
exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.bz2
exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.zip
fix merge conflict
Diffstat (limited to 'src/benchmark')
-rw-r--r--src/benchmark/benchmark.conf2
-rw-r--r--src/benchmark/taler-exchange-benchmark.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark.conf
index a52b0371..1ce943ce 100644
--- a/src/benchmark/benchmark.conf
+++ b/src/benchmark/benchmark.conf
@@ -45,7 +45,7 @@ USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
[account-2]
# What is the payto://-URL of the exchange (to generate wire response)
-URL = "payto://x-taler-bank/localhost:8082/2"
+PAYTO_URI = "payto://x-taler-bank/localhost:8082/2"
# What is the bank account (with the "Taler Bank" demo system)? Must end with "/".
WIRE_GATEWAY_URL = http://localhost:8082/2/
# This is the response we give out for the /wire request. It provides
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index cd21507f..a4249b36 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",