summaryrefslogtreecommitdiff
path: root/src/testing/testing_api_cmd_deposits_get.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/testing_api_cmd_deposits_get.c')
-rw-r--r--src/testing/testing_api_cmd_deposits_get.c9
1 files changed, 1 insertions, 8 deletions
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;