diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-04-22 19:09:55 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-04-22 19:09:55 +0200 |
commit | 95e52cd2e824f3e1e5e1c3537f11c2dd960dd9e5 (patch) | |
tree | 77af4123a71450f2da4d62f13c1a88a18b8d1e3f | |
parent | 9507c8c369c8ac56ae309b9b6132dd6213539e21 (diff) | |
download | exchange-95e52cd2e824f3e1e5e1c3537f11c2dd960dd9e5.tar.xz |
make names related to wire plugins less generic
-rw-r--r-- | src/exchange/taler-exchange-httpd_wire.c | 2 | ||||
-rw-r--r-- | src/exchange/test_taler_exchange_httpd.conf | 2 | ||||
-rw-r--r-- | src/wire/plugin_wire_template.c | 4 | ||||
-rw-r--r-- | src/wire/plugin_wire_test.c | 8 | ||||
-rw-r--r-- | src/wire/test_wire_plugin.conf | 2 | ||||
-rw-r--r-- | src/wire/wire-sepa.conf | 6 | ||||
-rw-r--r-- | src/wire/wire-test.conf | 6 |
7 files changed, 15 insertions, 15 deletions
diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c index 975788b35..79e69cc13 100644 --- a/src/exchange/taler-exchange-httpd_wire.c +++ b/src/exchange/taler-exchange-httpd_wire.c @@ -46,7 +46,7 @@ TMH_WIRE_handler_wire (struct TMH_RequestHandler *rh, static json_t *wire_methods; if (NULL == wire_methods) - wire_methods = TMH_VALIDATION_get_wire_methods ("wire-incoming"); + wire_methods = TMH_VALIDATION_get_wire_methods ("exchange-wire-incoming"); return TMH_RESPONSE_reply_json (connection, wire_methods, diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf index 642bbf668..19f448f3b 100644 --- a/src/exchange/test_taler_exchange_httpd.conf +++ b/src/exchange/test_taler_exchange_httpd.conf @@ -33,7 +33,7 @@ TESTRUN = YES DB_CONN_STR = "postgres:///talercheck" -[wire-outgoing-test] +[exchange-wire-outgoing-test] # What is the main website of the bank? BANK_URI = "http://localhost:8082/" diff --git a/src/wire/plugin_wire_template.c b/src/wire/plugin_wire_template.c index 826d93185..3bdc3cea2 100644 --- a/src/wire/plugin_wire_template.c +++ b/src/wire/plugin_wire_template.c @@ -230,12 +230,12 @@ libtaler_plugin_wire_template_init (void *cls) if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, - "wire-template", + "exchange-wire-template", "bank_uri", &tc->bank_uri)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "wire-template", + "exchange-wire-template", "bank_uri"); GNUNET_free (tc); return NULL; diff --git a/src/wire/plugin_wire_test.c b/src/wire/plugin_wire_test.c index 55d698172..80e5aaa8f 100644 --- a/src/wire/plugin_wire_test.c +++ b/src/wire/plugin_wire_test.c @@ -795,24 +795,24 @@ libtaler_plugin_wire_test_init (void *cls) { if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, - "wire-outgoing-test", + "exchange-wire-outgoing-test", "BANK_URI", &tc->bank_uri)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "wire-outgoing-test", + "exchange-wire-outgoing-test", "BANK_URI"); GNUNET_free (tc); return NULL; } if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, - "wire-outgoing-test", + "exchange-wire-outgoing-test", "EXCHANGE_ACCOUNT_NUMBER", &tc->exchange_account_outgoing_no)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "wire-outgoing-test", + "exchange-wire-outgoing-test", "EXCHANGE_ACCOUNT_NUMBER"); GNUNET_free (tc->bank_uri); GNUNET_free (tc); diff --git a/src/wire/test_wire_plugin.conf b/src/wire/test_wire_plugin.conf index b9aebdba7..8f7e311a6 100644 --- a/src/wire/test_wire_plugin.conf +++ b/src/wire/test_wire_plugin.conf @@ -11,7 +11,7 @@ TEST_RESPONSE_FILE = test_wire_plugin_test.json SEPA_RESPONSE_FILE = test_wire_plugin_sepa.json -[wire-outgoing-test] +[exchange-wire-outgoing-test] # For transfers made by the exchange, we need to know # the URI of the bank (where the /admin/add/incoming API # is avaialble). diff --git a/src/wire/wire-sepa.conf b/src/wire/wire-sepa.conf index 7321a2be6..b7c09153f 100644 --- a/src/wire/wire-sepa.conf +++ b/src/wire/wire-sepa.conf @@ -1,10 +1,10 @@ # Configuration for SEPA wire plugin. -[wire-incoming-sepa] +[exchange-wire-incoming-sepa] # This is the response we give out for the /wire request. It provides # wallets with the bank information for transfers to the exchange. -SEPA_RESPONSE_FILE = ${TALER_CONFIG_HOME}/sepa.json +SEPA_RESPONSE_FILE = ${TALER_CONFIG_HOME}/exchange/wire/sepa.json -[wire-outgoing-sepa] +[exchange-wire-outgoing-sepa] # This section should contain the options required for making outgoing # SEPA transfers. Not yet supported (need libebics). diff --git a/src/wire/wire-test.conf b/src/wire/wire-test.conf index 98e486acb..fc03f1b83 100644 --- a/src/wire/wire-test.conf +++ b/src/wire/wire-test.conf @@ -1,11 +1,11 @@ # This file is in the public domain. # -[wire-incoming-test] +[exchange-wire-incoming-test] # This is the response we give out for the /wire request. It provides # wallets with the bank information for transfers to the exchange. -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/test.json +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/exchange/wire/test.json -[wire-outgoing-test] +[exchange-wire-outgoing-test] # For outgoing transfers, we need to know the exchange's # account number at the bank. EXCHANGE_ACCOUNT_NUMBER = 2 |