diff options
author | Christian Blättler <blatc2@bfh.ch> | 2023-12-10 14:42:02 +0100 |
---|---|---|
committer | Christian Blättler <blatc2@bfh.ch> | 2023-12-10 14:42:02 +0100 |
commit | 62448125fbffb3bdd50fb5b5abc0d25e2449f8c6 (patch) | |
tree | 96a9381533384b1498eb642c5a9cbece52a385ce /src/bank-lib | |
parent | f99262923121d5c0e1b995e325d97830110f5ce5 (diff) | |
parent | cfdbc9a3c3fba99982beaf156794cb51494e0c3f (diff) | |
download | exchange-62448125fbffb3bdd50fb5b5abc0d25e2449f8c6.tar.xz |
Merge branch 'master' into feature/tokens
Diffstat (limited to 'src/bank-lib')
-rw-r--r-- | src/bank-lib/fakebank_tbi.c | 39 | ||||
-rw-r--r-- | src/bank-lib/fakebank_tbr_get_history.c | 2 | ||||
-rw-r--r-- | src/bank-lib/fakebank_twg_history.c | 4 |
3 files changed, 45 insertions, 0 deletions
diff --git a/src/bank-lib/fakebank_tbi.c b/src/bank-lib/fakebank_tbi.c index 27b930d9f..95e3a8c2e 100644 --- a/src/bank-lib/fakebank_tbi.c +++ b/src/bank-lib/fakebank_tbi.c @@ -49,6 +49,11 @@ TALER_FAKEBANK_tbi_main_ (struct TALER_FAKEBANK_Handle *h, (0 == strcasecmp (method, MHD_HTTP_METHOD_GET)) ) { + struct TALER_Amount zero; + + GNUNET_assert (GNUNET_OK == + TALER_amount_set_zero (h->currency, + &zero)); return TALER_MHD_REPLY_JSON_PACK ( connection, MHD_HTTP_OK, @@ -56,6 +61,40 @@ TALER_FAKEBANK_tbi_main_ (struct TALER_FAKEBANK_Handle *h, "0:0:0"), GNUNET_JSON_pack_string ("currency", h->currency), + GNUNET_JSON_pack_bool ("allow_conversion", + false), + GNUNET_JSON_pack_bool ("allow_registrations", + true), + GNUNET_JSON_pack_bool ("allow_deletions", + false), + GNUNET_JSON_pack_bool ("allow_edit_name", + false), + GNUNET_JSON_pack_bool ("allow_edit_cashout_payto_uri", + false), + TALER_JSON_pack_amount ("default_debit_threshold", + &zero), + GNUNET_JSON_pack_array_steal ("supported_tan_channels", + json_array ()), + GNUNET_JSON_pack_object_steal ( + "currency_specification", + GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("name", + h->currency), + GNUNET_JSON_pack_string ("currency", + h->currency), + GNUNET_JSON_pack_uint64 ("num_fractional_input_digits", + 2), + GNUNET_JSON_pack_uint64 ("num_fractional_normal_digits", + 2), + GNUNET_JSON_pack_uint64 ("num_fractional_trailing_zero_digits", + 2), + GNUNET_JSON_pack_object_steal ( + "alt_unit_names", + GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("0", + h->currency))), + GNUNET_JSON_pack_string ("name", + h->currency))), GNUNET_JSON_pack_string ("name", "taler-bank-integration")); } diff --git a/src/bank-lib/fakebank_tbr_get_history.c b/src/bank-lib/fakebank_tbr_get_history.c index e81e00894..79678636a 100644 --- a/src/bank-lib/fakebank_tbr_get_history.c +++ b/src/bank-lib/fakebank_tbr_get_history.c @@ -149,6 +149,7 @@ TALER_FAKEBANK_tbr_get_history_incoming ( if (GNUNET_TIME_relative_is_zero (hc->ha.lp_timeout) && (0 < hc->ha.delta)) { + acc_payto_uri = hc->acc->payto_uri; GNUNET_assert (0 == pthread_mutex_unlock (&h->big_lock)); if (overflow) @@ -160,6 +161,7 @@ TALER_FAKEBANK_tbr_get_history_incoming ( } if (h->in_shutdown) { + acc_payto_uri = hc->acc->payto_uri; GNUNET_assert (0 == pthread_mutex_unlock (&h->big_lock)); goto finish; diff --git a/src/bank-lib/fakebank_twg_history.c b/src/bank-lib/fakebank_twg_history.c index 1d70ed127..35cc6587f 100644 --- a/src/bank-lib/fakebank_twg_history.c +++ b/src/bank-lib/fakebank_twg_history.c @@ -147,6 +147,7 @@ TALER_FAKEBANK_twg_get_debit_history_ ( if ( (GNUNET_TIME_relative_is_zero (hc->ha.lp_timeout)) && (0 < hc->ha.delta)) { + acc_payto_uri = hc->acc->payto_uri; GNUNET_assert (0 == pthread_mutex_unlock (&h->big_lock)); if (overflow) @@ -160,6 +161,7 @@ TALER_FAKEBANK_twg_get_debit_history_ ( } if (h->in_shutdown) { + acc_payto_uri = hc->acc->payto_uri; GNUNET_assert (0 == pthread_mutex_unlock (&h->big_lock)); goto finish; @@ -400,6 +402,7 @@ TALER_FAKEBANK_twg_get_credit_history_ ( if (GNUNET_TIME_relative_is_zero (hc->ha.lp_timeout) && (0 < hc->ha.delta)) { + acc_payto_uri = hc->acc->payto_uri; GNUNET_assert (0 == pthread_mutex_unlock (&h->big_lock)); if (overflow) @@ -411,6 +414,7 @@ TALER_FAKEBANK_twg_get_credit_history_ ( } if (h->in_shutdown) { + acc_payto_uri = hc->acc->payto_uri; GNUNET_assert (0 == pthread_mutex_unlock (&h->big_lock)); goto finish; |