aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-05-03 20:12:18 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-05 16:50:12 +0200
commit532440acf829f794fec93952da889ca015559bb4 (patch)
tree27681e7ff2608f7e4f0b2f9edb999920c17bfffc /src/testing
parentd63cf1e40eb78348302eb187adf576f73a51e01a (diff)
modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/testing_api_cmd_deposits_get.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c
index 9b65822b4..d5617ec25 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -111,8 +111,7 @@ deposit_wtid_cb (void *cls,
switch (hr->http_status)
{
case MHD_HTTP_OK:
- GNUNET_assert (NULL != dd->wtid);
- tts->wtid = *dd->wtid;
+ tts->wtid = dd->wtid;
if (NULL != tts->bank_transfer_reference)
{
const struct TALER_TESTING_Command *bank_transfer_cmd;
@@ -140,11 +139,7 @@ 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);