taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make names related to wire plugins less generic

Browse Source
This commit is contained in:
Florian Dold 2016-04-22 19:09:55 +02:00
parent 9507c8c369
commit 95e52cd2e8
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange/taler-exchange-httpd_wire.c
View File

@ -46,7 +46,7 @@ TMH_WIRE_handler_wire (struct TMH_RequestHandler *rh,
static json_t *wire_methods; static json_t *wire_methods;
if (NULL == 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, return TMH_RESPONSE_reply_json (connection,
wire_methods, wire_methods,

2
src/exchange/test_taler_exchange_httpd.conf
View File

@ -33,7 +33,7 @@ TESTRUN = YES
DB_CONN_STR = "postgres:///talercheck" DB_CONN_STR = "postgres:///talercheck"
[wire-outgoing-test] [exchange-wire-outgoing-test]
# What is the main website of the bank? # What is the main website of the bank?
BANK_URI = "http://localhost:8082/" BANK_URI = "http://localhost:8082/"

4
src/wire/plugin_wire_template.c
View File

@ -230,12 +230,12 @@ libtaler_plugin_wire_template_init (void *cls)
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, GNUNET_CONFIGURATION_get_value_string (cfg,
"wire-template", "exchange-wire-template",
"bank_uri", "bank_uri",
&tc->bank_uri)) &tc->bank_uri))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"wire-template", "exchange-wire-template",
"bank_uri"); "bank_uri");
GNUNET_free (tc); GNUNET_free (tc);
return NULL; return NULL;

8
src/wire/plugin_wire_test.c
View File

@ -795,24 +795,24 @@ libtaler_plugin_wire_test_init (void *cls)
{ {
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, GNUNET_CONFIGURATION_get_value_string (cfg,
"wire-outgoing-test", "exchange-wire-outgoing-test",
"BANK_URI", "BANK_URI",
&tc->bank_uri)) &tc->bank_uri))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"wire-outgoing-test", "exchange-wire-outgoing-test",
"BANK_URI"); "BANK_URI");
GNUNET_free (tc); GNUNET_free (tc);
return NULL; return NULL;
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg, GNUNET_CONFIGURATION_get_value_number (cfg,
"wire-outgoing-test", "exchange-wire-outgoing-test",
"EXCHANGE_ACCOUNT_NUMBER", "EXCHANGE_ACCOUNT_NUMBER",
&tc->exchange_account_outgoing_no)) &tc->exchange_account_outgoing_no))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"wire-outgoing-test", "exchange-wire-outgoing-test",
"EXCHANGE_ACCOUNT_NUMBER"); "EXCHANGE_ACCOUNT_NUMBER");
GNUNET_free (tc->bank_uri); GNUNET_free (tc->bank_uri);
GNUNET_free (tc); GNUNET_free (tc);

2
src/wire/test_wire_plugin.conf
View File

@ -11,7 +11,7 @@ TEST_RESPONSE_FILE = test_wire_plugin_test.json
SEPA_RESPONSE_FILE = test_wire_plugin_sepa.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 # For transfers made by the exchange, we need to know
# the URI of the bank (where the /admin/add/incoming API # the URI of the bank (where the /admin/add/incoming API
# is avaialble). # is avaialble).

6
src/wire/wire-sepa.conf
View File

@ -1,10 +1,10 @@
# Configuration for SEPA wire plugin. # 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 # This is the response we give out for the /wire request. It provides
# wallets with the bank information for transfers to the exchange. # 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 # This section should contain the options required for making outgoing
# SEPA transfers. Not yet supported (need libebics). # SEPA transfers. Not yet supported (need libebics).

6
src/wire/wire-test.conf
View File

@ -1,11 +1,11 @@
# This file is in the public domain. # 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 # This is the response we give out for the /wire request. It provides
# wallets with the bank information for transfers to the exchange. # 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 # For outgoing transfers, we need to know the exchange's
# account number at the bank. # account number at the bank.
EXCHANGE_ACCOUNT_NUMBER = 2 EXCHANGE_ACCOUNT_NUMBER = 2