commit 1d43437991e52629a0dcc1ce97bb99b791ca6927
parent a0756dc30307dd24e2f58a4c01e90696fe77c567
Author: Jeff Burdges <burdges@gnunet.org>
Date: Wed, 20 Apr 2016 17:07:25 +0200
Merge branch 'master' of git.taler.net:/var/git/exchange
Diffstat:
11 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -15,6 +15,10 @@ if WALLET_ONLY
SUBDIRS = include util
else
+pkgcfgdir = $(prefix)/share/taler/config.d/
+pkgcfg_DATA = \
+ taler.conf
+
SUBDIRS = include util json $(PQ_DIR) $(BANK_LIB) wire exchangedb exchange exchange-tools
if HAVE_LIBCURL
SUBDIRS += exchange-lib
diff --git a/src/exchange-lib/test_exchange_api.conf b/src/exchange-lib/test_exchange_api.conf
@@ -4,10 +4,12 @@
# Persistant data storage for the testcase
TALER_TEST_HOME = test_exchange_api_home/
-[exchange]
+[taler]
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
+[exchange]
+
# Wire format supported by the exchange
# We use 'test' for testing of the actual
# coin operations, and 'sepa' to test SEPA-specific routines.
diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf
@@ -1,8 +1,6 @@
# This file is in the public domain.
#
[exchange]
-# Currency supported by the exchange (can only be one)
-# CURRENCY = EUR
# Where do we store the private keys the exchange needs at
# runtime? (Denomination and signing keys are then stored
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
@@ -249,12 +249,12 @@ exchange_serve_process_config ()
{
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
- "exchange",
+ "taler",
"currency",
&exchange_currency_string))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
+ "taler",
"currency");
return GNUNET_SYSERR;
}
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
@@ -378,12 +378,12 @@ exchange_serve_process_config ()
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
- "exchange",
+ "taler",
"currency",
&TMH_exchange_currency_string))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
+ "taler",
"currency");
return GNUNET_SYSERR;
}
diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf
@@ -2,11 +2,13 @@
# Persistant data storage for the testcase
TALER_TEST_HOME = test_taler_exchange_httpd_home/
-
-[exchange]
+[taler]
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
+
+[exchange]
+
# Wire format supported by the exchange
# We use 'test' for testing of the actual
# coin operations.
diff --git a/src/taler.conf b/src/taler.conf
@@ -0,0 +1,2 @@
+[taler]
+CURRENCY = KUDOS
diff --git a/src/wire/plugin_wire_sepa.c b/src/wire/plugin_wire_sepa.c
@@ -737,12 +737,12 @@ libtaler_plugin_wire_sepa_init (void *cls)
{
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
- "exchange",
+ "taler",
"CURRENCY",
&sc->currency))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
+ "taler",
"CURRENCY");
GNUNET_free (sc);
return NULL;
diff --git a/src/wire/plugin_wire_template.c b/src/wire/plugin_wire_template.c
@@ -242,12 +242,12 @@ libtaler_plugin_wire_template_init (void *cls)
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
- "exchange",
+ "taler",
"CURRENCY",
&tc->currency))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
+ "taler",
"CURRENCY");
GNUNET_free (tc->bank_uri);
GNUNET_free (tc);
diff --git a/src/wire/plugin_wire_test.c b/src/wire/plugin_wire_test.c
@@ -224,7 +224,7 @@ test_amount_round (void *cls,
if (NULL == tc->currency)
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
+ "taler",
"CURRENCY");
return GNUNET_SYSERR; /* not configured with currency */
}
@@ -820,12 +820,12 @@ libtaler_plugin_wire_test_init (void *cls)
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
- "exchange",
+ "taler",
"CURRENCY",
&tc->currency))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "exchange",
+ "taler",
"CURRENCY");
GNUNET_free (tc->bank_uri);
GNUNET_free (tc);
diff --git a/src/wire/test_wire_plugin.conf b/src/wire/test_wire_plugin.conf
@@ -17,5 +17,5 @@ SEPA_RESPONSE_FILE = test_wire_plugin_sepa.json
# is avaialble).
BANK_URI = http://localhost/
-[exchange]
+[taler]
CURRENCY = "EUR"
