diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-04-21 20:00:40 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-04-21 20:00:40 +0200 |
| commit | 21188ca703d05211e8d4d3ae9bd22500f53915ac (patch) | |
| tree | a0dbae4cd9a23ef810fa38af66a6359bd8da3ebc /src/exchange | |
| parent | 77e9e3a7f65db0940a0797d9b12ba883bbdae48e (diff) | |
| parent | 1d43437991e52629a0dcc1ce97bb99b791ca6927 (diff) | |
| download | exchange-21188ca703d05211e8d4d3ae9bd22500f53915ac.tar.gz exchange-21188ca703d05211e8d4d3ae9bd22500f53915ac.tar.bz2 exchange-21188ca703d05211e8d4d3ae9bd22500f53915ac.zip | |
Merge branch 'master' of ssh://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 eab476ccd..96322d6a2 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 e4ba975a2..0cb47667f 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 c99535382..6efb1492e 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -387,12 +387,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 612d9f4d4..642bbf668 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. |