diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-05-03 20:07:49 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-05-19 01:15:30 +0200 |
| commit | 353c4e2fa0ad2797c69aea1a580b6dc1f6e66508 (patch) | |
| tree | 7d1dc2efd7640f26888134de9ffa60d29a06e740 /src | |
| parent | 65c3c71ca9784d98f7b9a4aa13351fedc64af3c8 (diff) | |
| download | exchange-353c4e2fa0ad2797c69aea1a580b6dc1f6e66508.tar.xz | |
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 33987e161..58456a492 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); |