diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/taler_exchange_service.h | 4 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_deposits_get.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 2fb15db11..ea185f09a 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -1611,11 +1611,7 @@ struct TALER_EXCHANGE_TransferData struct GNUNET_TIME_Absolute execution_time; /** -<<<<<<< HEAD - * amount of the wire transfer; FIXME: total wired (without fee), or including @a wire_fee? -======= * amount of the wire transfer ->>>>>>> update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later */ struct TALER_Amount total_amount; 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, switch (hr->http_status) { case MHD_HTTP_OK: - tts->wtid = dd->wtid; + << << << < 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) if (NULL != tts->bank_transfer_reference) { const struct TALER_TESTING_Command *bank_transfer_cmd; @@ -147,6 +154,8 @@ deposit_wtid_cb (void *cls, return; } } + + break; case MHD_HTTP_ACCEPTED: /* allowed, nothing to check here */ |