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

match updated specification, use CREDIT instead of DEPOSIT for transfers into a reserve

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-30 18:09:47 +02:00
parent a41119833d
commit c686fac84b
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/exchange/taler-exchange-httpd_responses.c
View File

@ -452,15 +452,15 @@ TEH_RESPONSE_compile_reserve_history (
const struct TALER_EXCHANGEDB_ReserveHistory *rh, const struct TALER_EXCHANGEDB_ReserveHistory *rh,
struct TALER_Amount *balance) struct TALER_Amount *balance)
{ {
struct TALER_Amount deposit_total; struct TALER_Amount credit_total;
struct TALER_Amount withdraw_total; struct TALER_Amount withdraw_total;
json_t *json_history; json_t *json_history;
enum InitAmounts enum InitAmounts
{ {
/** Nothing initialized */ /** Nothing initialized */
IA_NONE = 0, IA_NONE = 0,
/** deposit_total initialized */ /** credit_total initialized */
IA_DEPOSIT = 1, IA_CREDIT = 1,
/** withdraw_total initialized */ /** withdraw_total initialized */
IA_WITHDRAW = 2 IA_WITHDRAW = 2
} init = IA_NONE; } init = IA_NONE;
@ -476,14 +476,14 @@ TEH_RESPONSE_compile_reserve_history (
{ {
const struct TALER_EXCHANGEDB_BankTransfer *bank = const struct TALER_EXCHANGEDB_BankTransfer *bank =
pos->details.bank; pos->details.bank;
if (0 == (IA_DEPOSIT & init)) if (0 == (IA_CREDIT & init))
{ {
deposit_total = bank->amount; credit_total = bank->amount;
init |= IA_DEPOSIT; init |= IA_CREDIT;
} }
else if (GNUNET_OK != else if (GNUNET_OK !=
TALER_amount_add (&deposit_total, TALER_amount_add (&credit_total,
&deposit_total, &credit_total,
&bank->amount)) &bank->amount))
{ {
GNUNET_break (0); GNUNET_break (0);
@ -495,7 +495,7 @@ TEH_RESPONSE_compile_reserve_history (
json_history, json_history,
json_pack ("{s:s, s:o, s:s, s:o, s:o}", json_pack ("{s:s, s:o, s:s, s:o, s:o}",
"type", "type",
"DEPOSIT", "CREDIT",
"timestamp", "timestamp",
GNUNET_JSON_from_time_abs (bank->execution_date), GNUNET_JSON_from_time_abs (bank->execution_date),
"sender_account_url", "sender_account_url",
@ -567,14 +567,14 @@ TEH_RESPONSE_compile_reserve_history (
struct TALER_ExchangePublicKeyP pub; struct TALER_ExchangePublicKeyP pub;
struct TALER_ExchangeSignatureP sig; struct TALER_ExchangeSignatureP sig;
if (0 == (IA_DEPOSIT & init)) if (0 == (IA_CREDIT & init))
{ {
deposit_total = recoup->value; credit_total = recoup->value;
init |= IA_DEPOSIT; init |= IA_CREDIT;
} }
else if (GNUNET_OK != else if (GNUNET_OK !=
TALER_amount_add (&deposit_total, TALER_amount_add (&credit_total,
&deposit_total, &credit_total,
&recoup->value)) &recoup->value))
{ {
GNUNET_break (0); GNUNET_break (0);
@ -709,9 +709,9 @@ TEH_RESPONSE_compile_reserve_history (
} }
} }
if (0 == (IA_DEPOSIT & init)) if (0 == (IA_CREDIT & init))
{ {
/* We should not have gotten here, without deposits no reserve /* We should not have gotten here, without credits no reserve
should exist! */ should exist! */
GNUNET_break (0); GNUNET_break (0);
json_decref (json_history); json_decref (json_history);
@ -721,12 +721,12 @@ TEH_RESPONSE_compile_reserve_history (
{ {
/* did not encounter any withdraw operations, set withdraw_total to zero */ /* did not encounter any withdraw operations, set withdraw_total to zero */
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_amount_get_zero (deposit_total.currency, TALER_amount_get_zero (credit_total.currency,
&withdraw_total)); &withdraw_total));
} }
if (GNUNET_SYSERR == if (GNUNET_SYSERR ==
TALER_amount_subtract (balance, TALER_amount_subtract (balance,
&deposit_total, &credit_total,
&withdraw_total)) &withdraw_total))
{ {
GNUNET_break (0); GNUNET_break (0);

2
src/lib/exchange_api_common.c
View File

@ -91,7 +91,7 @@ TALER_EXCHANGE_parse_reserve_history (
rhistory[off].amount = amount; rhistory[off].amount = amount;
if (0 == strcasecmp (type, if (0 == strcasecmp (type,
"DEPOSIT")) "CREDIT"))
{ {
const char *wire_url; const char *wire_url;
void *wire_reference; void *wire_reference;