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 e9d80d764a
commit d63cf1e40e
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/testing/testing_api_cmd_deposits_get.c
View File

@ -111,7 +111,8 @@ deposit_wtid_cb (void *cls,
switch (hr->http_status) switch (hr->http_status)
{ {
case MHD_HTTP_OK: case MHD_HTTP_OK:
tts->wtid = dd->wtid; GNUNET_assert (NULL != dd->wtid);
tts->wtid = *dd->wtid;
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;
@ -139,7 +140,11 @@ deposit_wtid_cb (void *cls,
} }
/* Compare that expected and gotten subjects match. */ /* Compare that expected and gotten subjects match. */
<<<<<<< HEAD
if (0 != GNUNET_memcmp (&dd->wtid, if (0 != GNUNET_memcmp (&dd->wtid,
=======
if (0 != GNUNET_memcmp (dd->wtid,
>>>>>>> modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later)
wtid_want)) wtid_want))
{ {
GNUNET_break (0); GNUNET_break (0);