aboutsummaryrefslogtreecommitdiff
path: root/src/benchmark
diff options
context:
space:
mode:
Diffstat (limited to 'src/benchmark')
-rw-r--r--src/benchmark/bank_details.json2
-rw-r--r--src/benchmark/merchant_details.json2
-rw-r--r--src/benchmark/taler-exchange-benchmark.c44
-rw-r--r--src/benchmark/taler-exchange-benchmark.conf2
-rw-r--r--src/benchmark/test_benchmark_home/.config/taler/test.json4
5 files changed, 27 insertions, 27 deletions
diff --git a/src/benchmark/bank_details.json b/src/benchmark/bank_details.json
index bc46c48f3..23f18119f 100644
--- a/src/benchmark/bank_details.json
+++ b/src/benchmark/bank_details.json
@@ -1 +1 @@
-{"type":"test", "bank_uri":"http://localhost:8082/", "account_number":63}
+{"type":"test", "bank_url":"http://localhost:8082/", "account_number":63}
diff --git a/src/benchmark/merchant_details.json b/src/benchmark/merchant_details.json
index c3869161d..db9832676 100644
--- a/src/benchmark/merchant_details.json
+++ b/src/benchmark/merchant_details.json
@@ -1 +1 @@
-{"type":"test", "bank_uri":"http://localhost:8082/", "account_number":64}
+{"type":"test", "bank_url":"http://localhost:8082/", "account_number":64}
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index c4f5420f9..fbdfe825c 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -288,7 +288,7 @@ static unsigned int pool_size = 100;
static char *config_file;
/**
- * Configuation object (used to get BANK_URI)
+ * Configuation object (used to get BANK_URL)
*/
static struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -371,15 +371,15 @@ static struct Coin *coins;
static struct TALER_MerchantPrivateKeyP merchant_priv;
/**
- * URI under which the exchange is reachable during the benchmark.
+ * URL under which the exchange is reachable during the benchmark.
*/
-static char *exchange_uri;
+static char *exchange_url;
/**
- * URI under which the administrative exchange is reachable during the
+ * URL under which the administrative exchange is reachable during the
* benchmark.
*/
-static char *exchange_admin_uri;
+static char *exchange_admin_url;
/**
* Used currency (read from /keys' output)
@@ -1641,7 +1641,7 @@ run (void *cls)
GNUNET_assert (NULL != rc);
fakebank = TALER_FAKEBANK_start (8082);
exchange = TALER_EXCHANGE_connect (ctx,
- exchange_uri,
+ exchange_url,
&cert_cb, NULL,
TALER_EXCHANGE_OPTION_END);
if (NULL == exchange)
@@ -1667,15 +1667,15 @@ main (int argc,
GNUNET_GETOPT_option_mandatory
(GNUNET_GETOPT_option_cfgfile (&config_file)),
GNUNET_GETOPT_option_string ('e',
- "exchange-uri",
- "URI",
- "URI of the exchange",
- &exchange_uri),
+ "exchange-url",
+ "URL",
+ "URL of the exchange",
+ &exchange_url),
GNUNET_GETOPT_option_string ('E',
- "exchange-admin-uri",
- "URI",
- "URI of the administrative interface of the exchange",
- &exchange_admin_uri),
+ "exchange-admin-url",
+ "URL",
+ "URL of the administrative interface of the exchange",
+ &exchange_admin_url),
GNUNET_GETOPT_option_help ("tool to benchmark the Taler exchange"),
GNUNET_GETOPT_option_uint ('s',
"pool-size",
@@ -1712,14 +1712,14 @@ main (int argc,
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Number of iterations below WARM_THRESHOLD of %llu\n",
WARM_THRESHOLD);
- if ( (NULL == exchange_uri) ||
- (0 == strlen (exchange_uri) ))
+ if ( (NULL == exchange_url) ||
+ (0 == strlen (exchange_url) ))
{
- GNUNET_free_non_null (exchange_uri);
- exchange_uri = GNUNET_strdup ("http://localhost:8081/");
+ GNUNET_free_non_null (exchange_url);
+ exchange_url = GNUNET_strdup ("http://localhost:8081/");
}
- if (NULL == exchange_admin_uri)
- exchange_admin_uri = GNUNET_strdup ("http://localhost:18080/");
+ if (NULL == exchange_admin_url)
+ exchange_admin_url = GNUNET_strdup ("http://localhost:18080/");
if (run_exchange)
{
char *wget;
@@ -1773,8 +1773,8 @@ main (int argc,
GNUNET_asprintf (&wget,
"wget -q -t 1 -T 1 %s%skeys -o /dev/null -O /dev/null",
- exchange_uri,
- (exchange_uri[strlen (exchange_uri)-1] == '/') ? "" : "/");
+ exchange_url,
+ (exchange_url[strlen (exchange_url)-1] == '/') ? "" : "/");
cnt = 0;
do {
fprintf (stderr, ".");
diff --git a/src/benchmark/taler-exchange-benchmark.conf b/src/benchmark/taler-exchange-benchmark.conf
index 1306e50fc..453782c7c 100644
--- a/src/benchmark/taler-exchange-benchmark.conf
+++ b/src/benchmark/taler-exchange-benchmark.conf
@@ -28,7 +28,7 @@ ENABLE = YES
# What is the main website of the bank?
# (Not used unless the aggregator is run.)
-BANK_URI = "http://localhost:8082/"
+BANK_URL = "http://localhost:8082/"
# From which account at the 'bank' should outgoing wire transfers be made?
BANK_ACCOUNT_NUMBER = 2
diff --git a/src/benchmark/test_benchmark_home/.config/taler/test.json b/src/benchmark/test_benchmark_home/.config/taler/test.json
index be5e92c11..eca394241 100644
--- a/src/benchmark/test_benchmark_home/.config/taler/test.json
+++ b/src/benchmark/test_benchmark_home/.config/taler/test.json
@@ -2,7 +2,7 @@
"salt": "AZPRFVJ58NM6M7J5CZQPJAH3EW5DYM52AEZ9Y1C1ER3W94QV8D8TQKF6CK8MYQRA9QMSKDQTGZ306ZS9GQ0M6R01CJ20KPP49WFDZK8",
"name": "The exchange",
"account_number": 3,
- "bank_uri": "http://localhost:8082/",
+ "bank_url": "http://localhost:8082/",
"type": "test",
"sig": "RPQXP9S4P8PQP7HEZQNRSZCT0ATNEP8GW0P5TPM34V5RX86FCD670V44R9NETSYDDKB8SZV7TKY9PAJYTY51D3VDWY9XXQ5BPFRXR28"
-} \ No newline at end of file
+}