diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-03-02 21:07:27 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-03-02 21:07:27 +0100 |
| commit | 17ff4f5e97b981f0b3eebd6e3923fe60dc75edd5 (patch) | |
| tree | 585b6cbe92aec91b2e186206c1bfe746a0cd85e6 /src/wire | |
| parent | 531272a92a5aa08559436138ff5106a6bff1b361 (diff) | |
| parent | 201b2b3d1af2a4d44fe32c8b0312d935845cf129 (diff) | |
| download | exchange-17ff4f5e97b981f0b3eebd6e3923fe60dc75edd5.tar.gz exchange-17ff4f5e97b981f0b3eebd6e3923fe60dc75edd5.tar.bz2 exchange-17ff4f5e97b981f0b3eebd6e3923fe60dc75edd5.zip | |
fixing #4230 in bank-lib
Diffstat (limited to 'src/wire')
| -rw-r--r-- | src/wire/plugin_wire_sepa.c | 4 | ||||
| -rw-r--r-- | src/wire/plugin_wire_template.c | 4 | ||||
| -rw-r--r-- | src/wire/plugin_wire_test.c | 29 | ||||
| -rw-r--r-- | src/wire/test_sepa_wireformat.c | 2 |
4 files changed, 33 insertions, 6 deletions
diff --git a/src/wire/plugin_wire_sepa.c b/src/wire/plugin_wire_sepa.c index 00d19d4b0..4d902f962 100644 --- a/src/wire/plugin_wire_sepa.c +++ b/src/wire/plugin_wire_sepa.c @@ -501,12 +501,12 @@ libtaler_plugin_wire_sepa_init (void *cls) sc = GNUNET_new (struct SepaClosure); if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, - "mint", + "exchange", "CURRENCY", &sc->currency)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "mint", + "exchange", "CURRENCY"); GNUNET_free (sc); return NULL; diff --git a/src/wire/plugin_wire_template.c b/src/wire/plugin_wire_template.c index baf0ee7d5..2e9512e57 100644 --- a/src/wire/plugin_wire_template.c +++ b/src/wire/plugin_wire_template.c @@ -197,12 +197,12 @@ libtaler_plugin_wire_template_init (void *cls) } if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, - "mint", + "exchange", "CURRENCY", &tc->currency)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "mint", + "exchange", "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 index d6bf411c1..9503e1ca5 100644 --- a/src/wire/plugin_wire_test.c +++ b/src/wire/plugin_wire_test.c @@ -46,7 +46,7 @@ struct TestClosure /** * Number of the account that the exchange has at the bank. */ - uint64_t exchange_account_no; + unsigned long long exchange_account_no; /** * Handle to the bank task, or NULL. @@ -494,6 +494,7 @@ test_execute_wire_transfer (void *cls, eh->aaih = TALER_BANK_admin_add_incoming (tc->bank, &bf.wtid, &amount, + (uint64_t) tc->exchange_account_no, (uint64_t) account_no, &execute_cb, eh); @@ -556,6 +557,32 @@ libtaler_plugin_wire_test_init (void *cls) return NULL; } tc = GNUNET_new (struct TestClosure); + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (cfg, + "wire-test", + "BANK_ACCOUNT_NO", + &tc->exchange_account_no)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "wire-test", + "BANK_ACCOUNT_NO"); + GNUNET_free (uri); + GNUNET_free (tc); + return NULL; + } + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_string (cfg, + "exchange", + "CURRENCY", + &tc->currency)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "exchange", + "CURRENCY"); + GNUNET_free (uri); + GNUNET_free (tc); + return NULL; + } tc->bank = TALER_BANK_init (uri); if (NULL == tc->bank) { diff --git a/src/wire/test_sepa_wireformat.c b/src/wire/test_sepa_wireformat.c index edbe5bc45..5081cbe86 100644 --- a/src/wire/test_sepa_wireformat.c +++ b/src/wire/test_sepa_wireformat.c @@ -77,7 +77,7 @@ main(int argc, NULL); cfg = GNUNET_CONFIGURATION_create (); GNUNET_CONFIGURATION_set_value_string (cfg, - "mint", + "exchange", "currency", "EUR"); plugin = TALER_WIRE_plugin_load (cfg, |