modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies

2 files changed, 1 insertions, 9 deletions

diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index ea185f09a..38928dc18 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1722,7 +1722,6 @@ struct TALER_EXCHANGE_DepositData
    * yet execute the transaction
    */
   struct TALER_Amount coin_contribution;
-
 };
 
 
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c
index 700b0edf4..d5617ec25 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -111,14 +111,7 @@ deposit_wtid_cb (void *cls,
   switch (hr->http_status)
   {
   case MHD_HTTP_OK:
-      << << << < HEAD
-      tts->wtid = dd->wtid;
-    ====== =
-      GNUNET_assert (NULL != dd->wtid);
-    tts->wtid = *dd->wtid;
-    >> >> >> > modify
-    TALER_EXCHANGE_deposits_get () API to combine returned arguments into
-    a struct (simplifies merchant later)
+    tts->wtid = dd->wtid;
     if (NULL != tts->bank_transfer_reference)
     {
       const struct TALER_TESTING_Command *bank_transfer_cmd;