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

modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later)

Browse Source
This commit is contained in:
Christian Grothoff 2020-05-03 20:07:49 +02:00
parent ef97d426b1
commit cdbf3a05ae
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/taler_exchange_service.h
View File

@ -1611,11 +1611,7 @@ struct TALER_EXCHANGE_TransferData
struct GNUNET_TIME_Absolute execution_time; struct GNUNET_TIME_Absolute execution_time;
/** /**
<<<<<<< HEAD
* amount of the wire transfer; FIXME: total wired (without fee), or including @a wire_fee?
=======
* amount of the wire transfer * amount of the wire transfer
>>>>>>> update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later
*/ */
struct TALER_Amount total_amount; struct TALER_Amount total_amount;

9
src/testing/testing_api_cmd_deposits_get.c
View File

@ -111,7 +111,14 @@ deposit_wtid_cb (void *cls,
switch (hr->http_status) switch (hr->http_status)
{ {
case MHD_HTTP_OK: case MHD_HTTP_OK:
<< << << < HEAD
tts->wtid = dd->wtid; tts->wtid = dd->wtid;
====== =
GNUNET_assert (NULL != dd->wtid);
tts->wtid = *dd->wtid;
>> >> >> > modify
TALER_EXCHANGE_deposits_get () API to combine returned arguments into
a struct (simplifies merchant later)
if (NULL != tts->bank_transfer_reference) if (NULL != tts->bank_transfer_reference)
{ {
const struct TALER_TESTING_Command *bank_transfer_cmd; const struct TALER_TESTING_Command *bank_transfer_cmd;
@ -147,6 +154,8 @@ deposit_wtid_cb (void *cls,
return; return;
} }
} }
break; break;
case MHD_HTTP_ACCEPTED: case MHD_HTTP_ACCEPTED:
/* allowed, nothing to check here */ /* allowed, nothing to check here */