From d63cf1e40eb78348302eb187adf576f73a51e01a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 3 May 2020 20:07:49 +0200
Subject: [PATCH] modify TALER_EXCHANGE_deposits_get() API to combine returned
 arguments into a struct (simplifies merchant later)

---
 src/testing/testing_api_cmd_deposits_get.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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);