summaryrefslogtreecommitdiff
path: root/src/benchmark
diff options
context:
space:
mode:
Diffstat (limited to 'src/benchmark')
-rw-r--r--src/benchmark/benchmark.conf41
-rw-r--r--src/benchmark/taler-aggregator-benchmark.c2
2 files changed, 22 insertions, 21 deletions
diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark.conf
index 5716770c3..844106cf5 100644
--- a/src/benchmark/benchmark.conf
+++ b/src/benchmark/benchmark.conf
@@ -3,30 +3,31 @@
[paths]
# Persistent data storage for the testcase
# This value is a default for `taler_config_home'
-taler_test_home = exchange_benchmark_home/
+TALER_TEST_HOME = exchange_benchmark_home/
[taler]
# Currency supported by the exchange (can only be one)
-currency = EUR
+CURRENCY = EUR
CURRENCY_ROUND_UNIT = EUR:0.01
[exchange]
-# how long is one signkey valid?
-signkey_duration = 4 weeks
-signkey_legal_duration = 2 years
-# how long do we provide to clients denomination and signing keys
-# ahead of time?
-# Keep it short so the test runs fast.
-lookahead_sign = 12h
+
+SIGNKEY_LEGAL_DURATION = 2 years
+
# HTTP port the exchange listens to
-port = 8081
+PORT = 8081
# Master public key used to sign the exchange's various keys
-master_public_key = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
# How to access our database
DB = postgres
# Base URL of the exchange. Must be set to a URL where the
# exchange (or the twister) is actually listening.
-base_url = "http://localhost:8081/"
+BASE_URL = "http://localhost:8081/"
+
+AGGREGATOR_SHARD_SIZE = 268435456
+#AGGREGATOR_SHARD_SIZE = 2147483648
+
+
WIREWATCH_IDLE_SLEEP_INTERVAL = 5 ms
@@ -37,12 +38,12 @@ MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
BASE_URL = "http://localhost:8083/"
[exchangedb-postgres]
-config = "postgres:///talercheck"
+CONFIG = "postgres:///talercheck"
[benchmark-remote-exchange]
-host = localhost
+HOST = localhost
# Adjust $HOME to match remote target!
-dir = $HOME/repos/taler/exchange/src/benchmark
+DIR = $HOME/repos/taler/exchange/src/benchmark
[bank]
HTTP_PORT = 8082
@@ -56,22 +57,22 @@ USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
[exchange-account-2]
# What is the payto://-URL of the exchange (to generate wire response)
PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange"
-enable_debit = YES
-enable_credit = YES
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
[exchange-accountcredentials-2]
# What is the bank account (with the "Taler Bank" demo system)? Must end with "/".
WIRE_GATEWAY_URL = http://localhost:8082/taler-wire-gateway/Exchange/
# Authentication information for basic authentication
WIRE_GATEWAY_AUTH_METHOD = "basic"
-username = Exchange
-password = x
+USERNAME = Exchange
+PASSWORD = x
[exchange-account-aggregator]
# What is the payto://-URL of the exchange (to generate wire response)
PAYTO_URI = "payto://aggregator-benchmark/exchangeacc"
-enable_debit = YES
+ENABLE_DEBIT = YES
diff --git a/src/benchmark/taler-aggregator-benchmark.c b/src/benchmark/taler-aggregator-benchmark.c
index 03375d4e3..283ee23ba 100644
--- a/src/benchmark/taler-aggregator-benchmark.c
+++ b/src/benchmark/taler-aggregator-benchmark.c
@@ -435,7 +435,7 @@ work (void *cls)
* @param cls unused
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
+ * @param c configuration
*/
static void
run (void *cls,