summaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/test-taler-exchange-aggregator-postgres.conf2
-rw-r--r--src/testing/test-taler-exchange-wirewatch-postgres.conf2
-rw-r--r--src/testing/test_auditor_api.c2
-rw-r--r--src/testing/test_auditor_api.conf6
-rw-r--r--src/testing/test_bank_api.c4
-rw-r--r--src/testing/test_bank_api_fakebank.conf2
-rw-r--r--src/testing/test_bank_api_fakebank_twisted.conf4
-rw-r--r--src/testing/test_bank_api_pybank.conf2
-rw-r--r--src/testing/test_bank_api_pybank_twisted.conf4
-rw-r--r--src/testing/test_bank_api_twisted.c4
-rw-r--r--src/testing/test_exchange_api.c2
-rw-r--r--src/testing/test_exchange_api.conf6
-rw-r--r--src/testing/test_exchange_api_keys_cherry_picking.conf4
-rw-r--r--src/testing/test_exchange_api_revocation.c2
-rw-r--r--src/testing/test_exchange_api_twisted.c2
-rw-r--r--src/testing/test_exchange_api_twisted.conf4
-rw-r--r--src/testing/test_taler_exchange_aggregator.c2
-rw-r--r--src/testing/test_taler_exchange_wirewatch.c2
18 files changed, 28 insertions, 28 deletions
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf
index dab0f74a2..6f5f9d83a 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -54,7 +54,7 @@ IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
# the legal expiration timeframe of withdrawn coins.
LEGAL_RESERVE_EXPIRATION_TIME = 7 years
-[account-1]
+[exchange-account-1]
# What is the account URL?
PAYTO_URI = "payto://x-taler-bank/localhost/2"
diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index 740fbe873..19db0e0bf 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -43,7 +43,7 @@ BASE_URL = "http://localhost:8083/"
# HTTP port the auditor listens to
PORT = 8083
-[account-1]
+[exchange-account-1]
# What is the account URL?
PAYTO_URI = "payto://x-taler-bank/localhost/2"
diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c
index 922361026..144f004d6 100644
--- a/src/testing/test_auditor_api.c
+++ b/src/testing/test_auditor_api.c
@@ -673,7 +673,7 @@ main (int argc,
/* Check fakebank port is available and get configuration data. */
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (CONFIG_FILE,
- "account-2",
+ "exchange-account-2",
&bc))
return 77;
TALER_TESTING_cleanup_files (CONFIG_FILE);
diff --git a/src/testing/test_auditor_api.conf b/src/testing/test_auditor_api.conf
index dab354cd4..9a4804908 100644
--- a/src/testing/test_auditor_api.conf
+++ b/src/testing/test_auditor_api.conf
@@ -51,13 +51,13 @@ CONFIG = "postgres:///talercheck"
[auditordb-postgres]
CONFIG = "postgres:///talercheck"
-# Sections starting with "account-" configure the bank accounts
+# Sections starting with "exchange-account-" configure the bank accounts
# of the exchange. The "URL" specifies the account in
# payto://-format, while the WIRE_JSON specifies the
# (possibly offline) signed version to be returned in /wire.
# WIRE_JSON is optional, as not all accounts must be
# advertised in /wire.
-[account-1]
+[exchange-account-1]
# What is the URL of our account?
PAYTO_URI = "payto://x-taler-bank/localhost/42"
WIRE_GATEWAY_URL = "http://localhost:8082/42/"
@@ -73,7 +73,7 @@ HTTP_PORT = 8082
# ENABLE_CREDIT = YES
-[account-2]
+[exchange-account-2]
# What is the bank account (with the "Taler Bank" demo system)?
WIRE_GATEWAY_URL = "http://localhost:8082/2/"
PAYTO_URI = "payto://x-taler-bank/localhost/2"
diff --git a/src/testing/test_bank_api.c b/src/testing/test_bank_api.c
index e7d2aefae..bdafdc5fd 100644
--- a/src/testing/test_bank_api.c
+++ b/src/testing/test_bank_api.c
@@ -137,7 +137,7 @@ main (int argc,
cfgfilename = CONFIG_FILE_FAKEBANK;
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (CONFIG_FILE_FAKEBANK,
- "account-2",
+ "exchange-account-2",
&bc))
{
GNUNET_break (0);
@@ -150,7 +150,7 @@ main (int argc,
cfgfilename = CONFIG_FILE_PYBANK;
if (GNUNET_OK !=
TALER_TESTING_prepare_bank (CONFIG_FILE_PYBANK,
- "account-2",
+ "exchange-account-2",
&bc))
{
GNUNET_break (0);
diff --git a/src/testing/test_bank_api_fakebank.conf b/src/testing/test_bank_api_fakebank.conf
index f3325986a..3d448ec52 100644
--- a/src/testing/test_bank_api_fakebank.conf
+++ b/src/testing/test_bank_api_fakebank.conf
@@ -3,7 +3,7 @@
[taler]
currency = KUDOS
-[account-2]
+[exchange-account-2]
PAYTO_URI = payto://x-taler-bank/localhost/2
METHOD = x-taler-bank
WIRE_GATEWAY_URL = "http://localhost:8081/2/"
diff --git a/src/testing/test_bank_api_fakebank_twisted.conf b/src/testing/test_bank_api_fakebank_twisted.conf
index 3b7b49612..72ab867b6 100644
--- a/src/testing/test_bank_api_fakebank_twisted.conf
+++ b/src/testing/test_bank_api_fakebank_twisted.conf
@@ -27,8 +27,8 @@ serve = http
http_port = 8081
database = postgres:///talercheck
-[account-1]
+[exchange-account-1]
PAYTO_URI = payto://x-taler-bank/localhost:8081/1
-[account-2]
+[exchange-account-2]
PAYTO_URI = payto://x-taler-bank/localhost:8081/2
diff --git a/src/testing/test_bank_api_pybank.conf b/src/testing/test_bank_api_pybank.conf
index 0e1036da8..9070e31e5 100644
--- a/src/testing/test_bank_api_pybank.conf
+++ b/src/testing/test_bank_api_pybank.conf
@@ -3,7 +3,7 @@
[taler]
currency = KUDOS
-[account-2]
+[exchange-account-2]
PAYTO_URI = payto://x-taler-bank/localhost/Exchange
METHOD = x-taler-bank
WIRE_GATEWAY_URL = "http://localhost:8081/taler-wire-gateway/Exchange/"
diff --git a/src/testing/test_bank_api_pybank_twisted.conf b/src/testing/test_bank_api_pybank_twisted.conf
index e5408674c..3801590bf 100644
--- a/src/testing/test_bank_api_pybank_twisted.conf
+++ b/src/testing/test_bank_api_pybank_twisted.conf
@@ -29,11 +29,11 @@ http_port = 8081
database = postgres:///talercheck
-[account-1]
+[exchange-account-1]
PAYTO_URI = payto://x-taler-bank/localhost/1
-[account-2]
+[exchange-account-2]
PAYTO_URI = payto://x-taler-bank/localhost/Exchange
METHOD = x-taler-bank
WIRE_GATEWAY_URL = "http://localhost:8888/taler-wire-gateway/Exchange/"
diff --git a/src/testing/test_bank_api_twisted.c b/src/testing/test_bank_api_twisted.c
index 49028946f..4ec4a1b9e 100644
--- a/src/testing/test_bank_api_twisted.c
+++ b/src/testing/test_bank_api_twisted.c
@@ -164,7 +164,7 @@ main (int argc,
TALER_LOG_DEBUG ("Running against the Fakebank.\n");
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (cfgfilename,
- "account-2",
+ "exchange-account-2",
&bc))
{
GNUNET_break (0);
@@ -177,7 +177,7 @@ main (int argc,
TALER_LOG_DEBUG ("Running against the Pybank.\n");
if (GNUNET_OK !=
TALER_TESTING_prepare_bank (cfgfilename,
- "account-2",
+ "exchange-account-2",
&bc))
{
GNUNET_break (0);
diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
index 84d5dc9b4..38d0c9212 100644
--- a/src/testing/test_exchange_api.c
+++ b/src/testing/test_exchange_api.c
@@ -795,7 +795,7 @@ main (int argc,
/* Check fakebank port is available and get config */
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (CONFIG_FILE,
- "account-2",
+ "exchange-account-2",
&bc))
return 77;
TALER_TESTING_cleanup_files (CONFIG_FILE);
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index 028f1d7e2..ed74d89ec 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -52,13 +52,13 @@ CONFIG = "postgres:///talercheck"
[auditordb-postgres]
CONFIG = "postgres:///talercheck"
-# Sections starting with "account-" configure the bank accounts
+# Sections starting with "exchange-account-" configure the bank accounts
# of the exchange. The "URL" specifies the account in
# payto://-format, while the WIRE_JSON specifies the
# (possibly offline) signed version to be returned in /wire.
# WIRE_JSON is optional, as not all accounts must be
# advertised in /wire.
-[account-1]
+[exchange-account-1]
# What is the URL of our account?
PAYTO_URI = "payto://x-taler-bank/localhost/42"
# This is the response we give out for the /wire request. It provides
@@ -72,7 +72,7 @@ WIRE_GATEWAY_URL = "http://localhost:9081/42/"
# ENABLE_CREDIT = YES
-[account-2]
+[exchange-account-2]
# What is the bank account (with the "Taler Bank" demo system)?
PAYTO_URI = "payto://x-taler-bank/localhost/2"
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf
index ea516168d..6823e81de 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking.conf
@@ -65,7 +65,7 @@ CONFIG = "postgres:///talercheck"
CONFIG = "postgres:///talercheck"
-[account-1]
+[exchange-account-1]
# This is the response we give out for the /wire request. It provides
# wallets with the bank information for transfers to the exchange.
WIRE_RESPONSE = ${TALER_CONFIG_HOME}/iban.json
@@ -78,7 +78,7 @@ METHOD = "x-taler-bank"
WIRE_GATEWAY_URL = "http://localhost:9082/42/"
-[account-2]
+[exchange-account-2]
# This is the response we give out for the /wire request. It provides
# wallets with the bank information for transfers to the exchange.
WIRE_RESPONSE = ${TALER_CONFIG_HOME}/x-taler-bank.json
diff --git a/src/testing/test_exchange_api_revocation.c b/src/testing/test_exchange_api_revocation.c
index 110dec166..45463dedf 100644
--- a/src/testing/test_exchange_api_revocation.c
+++ b/src/testing/test_exchange_api_revocation.c
@@ -194,7 +194,7 @@ main (int argc,
/* Check fakebank port is available and get config */
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (CONFIG_FILE,
- "account-2",
+ "exchange-account-2",
&bc))
return 77;
TALER_TESTING_cleanup_files (CONFIG_FILE);
diff --git a/src/testing/test_exchange_api_twisted.c b/src/testing/test_exchange_api_twisted.c
index 3b95e1514..46807e9c0 100644
--- a/src/testing/test_exchange_api_twisted.c
+++ b/src/testing/test_exchange_api_twisted.c
@@ -288,7 +288,7 @@ main (int argc,
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (CONFIG_FILE,
- "account-2",
+ "exchange-account-2",
&bc))
return 77;
diff --git a/src/testing/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted.conf
index b09f8aa5d..5158aefeb 100644
--- a/src/testing/test_exchange_api_twisted.conf
+++ b/src/testing/test_exchange_api_twisted.conf
@@ -56,7 +56,7 @@ PORT = 8083
[auditordb-postgres]
CONFIG = "postgres:///talercheck"
-[account-1]
+[exchange-account-1]
# What is the URL of our account?
PAYTO_URI = "payto://x-taler-bank/localhost/42"
# This is the response we give out for the /wire request. It provides
@@ -68,7 +68,7 @@ WIRE_GATEWAY_URL = "http://localhost:9081/42/"
WIRE_GATEWAY_AUTH_METHOD = NONE
-[account-2]
+[exchange-account-2]
PAYTO_URI = payto://x-taler-bank/localhost/2
WIRE_GATEWAY_URL = "http://localhost:8082/2/"
WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-2.json
diff --git a/src/testing/test_taler_exchange_aggregator.c b/src/testing/test_taler_exchange_aggregator.c
index 84695ca0e..c709e5fe9 100644
--- a/src/testing/test_taler_exchange_aggregator.c
+++ b/src/testing/test_taler_exchange_aggregator.c
@@ -492,7 +492,7 @@ main (int argc,
}
if (GNUNET_OK != TALER_TESTING_prepare_fakebank (config_filename,
- "account-1",
+ "exchange-account-1",
&bc))
{
TALER_LOG_WARNING ("Could not prepare the fakebank\n");
diff --git a/src/testing/test_taler_exchange_wirewatch.c b/src/testing/test_taler_exchange_wirewatch.c
index 5a202bef0..ab3246b7e 100644
--- a/src/testing/test_taler_exchange_wirewatch.c
+++ b/src/testing/test_taler_exchange_wirewatch.c
@@ -168,7 +168,7 @@ main (int argc,
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (config_filename,
- "account-1",
+ "exchange-account-1",
&bc))
return 77;