aboutsummaryrefslogtreecommitdiff
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.c11
1 files changed, 10 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..700b0edf4 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -111,7 +111,14 @@ deposit_wtid_cb (void *cls,
111 switch (hr->http_status) 111 switch (hr->http_status)
112 { 112 {
113 case MHD_HTTP_OK: 113 case MHD_HTTP_OK:
114 tts->wtid = dd->wtid; 114 << << << < HEAD
115 tts->wtid = dd->wtid;
116 ====== =
117 GNUNET_assert (NULL != dd->wtid);
118 tts->wtid = *dd->wtid;
119 >> >> >> > modify
120 TALER_EXCHANGE_deposits_get () API to combine returned arguments into
121 a struct (simplifies merchant later)
115 if (NULL != tts->bank_transfer_reference) 122 if (NULL != tts->bank_transfer_reference)
116 { 123 {
117 const struct TALER_TESTING_Command *bank_transfer_cmd; 124 const struct TALER_TESTING_Command *bank_transfer_cmd;
@@ -147,6 +154,8 @@ deposit_wtid_cb (void *cls,
147 return; 154 return;
148 } 155 }
149 } 156 }
157
158
150 break; 159 break;
151 case MHD_HTTP_ACCEPTED: 160 case MHD_HTTP_ACCEPTED:
152 /* allowed, nothing to check here */ 161 /* allowed, nothing to check here */