[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 110/152: modify TALER_EXCHANGE_deposits_get() API to co
From: |
gnunet |
Subject: |
[taler-exchange] 110/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later) |
Date: |
Sun, 05 Jul 2020 20:47:46 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit cdbf3a05ae3c92122b8ec15073c6fadfa0793315
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun May 3 20:07:49 2020 +0200
modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into
a struct (simplifies merchant later)
---
src/include/taler_exchange_service.h | 4 ----
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 2fb15db1..ea185f09 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 33987e16..700b0edf 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 */
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 95/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies, (continued)
- [taler-exchange] 95/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies, gnunet, 2020/07/05
- [taler-exchange] 97/152: return fee as well, gnunet, 2020/07/05
- [taler-exchange] 98/152: towards changing timestamp in deposit confirmation (tests failing), gnunet, 2020/07/05
- [taler-exchange] 90/152: implement #6181, gnunet, 2020/07/05
- [taler-exchange] 105/152: use unregister, gnunet, 2020/07/05
- [taler-exchange] 91/152: void basedb due to signature format change, gnunet, 2020/07/05
- [taler-exchange] 101/152: implement #6181, gnunet, 2020/07/05
- [taler-exchange] 106/152: more ecs, gnunet, 2020/07/05
- [taler-exchange] 103/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies, gnunet, 2020/07/05
- [taler-exchange] 108/152: implement #6181, gnunet, 2020/07/05
- [taler-exchange] 110/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later),
gnunet <=
- [taler-exchange] 117/152: fix drop call, gnunet, 2020/07/05
- [taler-exchange] 116/152: update, gnunet, 2020/07/05
- [taler-exchange] 121/152: update ECs, gnunet, 2020/07/05
- [taler-exchange] 120/152: more ECs, gnunet, 2020/07/05
- [taler-exchange] 124/152: fixed endianness in taler_sq_lib, gnunet, 2020/07/05
- [taler-exchange] 125/152: taler_error_codes.h auto generated from gnunet/gana.git as a submodule, gnunet, 2020/07/05
- [taler-exchange] 113/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later), gnunet, 2020/07/05
- [taler-exchange] 112/152: return fee as well, gnunet, 2020/07/05
- [taler-exchange] 64/152: update gana, gnunet, 2020/07/05
- [taler-exchange] 77/152: synchronize with latest GANA, gnunet, 2020/07/05