diff options
| author | Jeff Burdges <burdges@gnunet.org> | 2016-04-20 17:07:25 +0200 |
|---|---|---|
| committer | Jeff Burdges <burdges@gnunet.org> | 2016-04-20 17:07:25 +0200 |
| commit | 1d43437991e52629a0dcc1ce97bb99b791ca6927 (patch) | |
| tree | 6fe73342fb28452fa629f7adcc068a55bf963ff2 /src/exchange | |
| parent | a0756dc30307dd24e2f58a4c01e90696fe77c567 (diff) | |
| parent | fda03a481f2da4e0fefbac69253734ce1d304874 (diff) | |
Merge branch 'master' of git.taler.net:/var/git/exchange
Diffstat (limited to 'src/exchange')
| -rw-r--r-- | src/exchange/exchange.conf | 2 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-aggregator.c | 4 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd.c | 4 | ||||
| -rw-r--r-- | src/exchange/test_taler_exchange_httpd.conf | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf index eab476cc..96322d6a 100644 --- 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 index e4ba975a..0cb47667 100644 --- 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 index a533a973..46e545e5 100644 --- 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 index 5b49c082..ca33301f 100644 --- 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. |