diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-05-03 20:07:49 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:50:12 +0200 |
| commit | d63cf1e40eb78348302eb187adf576f73a51e01a (patch) | |
| tree | 4b511735ed76ae648fe6bbfa1c3e862592eb491a /src | |
| parent | e9d80d764a6b9e17e6b37e3d57ea24cb60aae7c5 (diff) | |
| download | exchange-d63cf1e40eb78348302eb187adf576f73a51e01a.tar.gz exchange-d63cf1e40eb78348302eb187adf576f73a51e01a.tar.bz2 exchange-d63cf1e40eb78348302eb187adf576f73a51e01a.zip | |
modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testing/testing_api_cmd_deposits_get.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c index d5617ec25..9b65822b4 100644 --- a/src/testing/testing_api_cmd_deposits_get.c +++ b/src/testing/testing_api_cmd_deposits_get.c @@ -111,7 +111,8 @@ deposit_wtid_cb (void *cls, switch (hr->http_status) { case MHD_HTTP_OK: - tts->wtid = dd->wtid; + GNUNET_assert (NULL != dd->wtid); + tts->wtid = *dd->wtid; if (NULL != tts->bank_transfer_reference) { const struct TALER_TESTING_Command *bank_transfer_cmd; @@ -139,7 +140,11 @@ deposit_wtid_cb (void *cls, } /* Compare that expected and gotten subjects match. */ +<<<<<<< HEAD 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)) { GNUNET_break (0); |