[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: address FIXMEs: support args bei
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: address FIXMEs: support args being optional, detail does not exist in reply, so remove obsolete FIXME |
Date: |
Fri, 30 Oct 2020 16:26:31 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new df8395e address FIXMEs: support args being optional, detail does not
exist in reply, so remove obsolete FIXME
df8395e is described below
commit df8395e9c528a3eed89ce0814bc8b5c37daae267
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Oct 30 16:26:28 2020 +0100
address FIXMEs: support args being optional, detail does not exist in
reply, so remove obsolete FIXME
---
src/include/taler_merchant_service.h | 8 +++++---
src/lib/merchant_api_get_transfers.c | 11 ++++++-----
src/lib/merchant_api_merchant_get_order.c | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/include/taler_merchant_service.h
b/src/include/taler_merchant_service.h
index 7c757c7..656ae76 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -2674,17 +2674,19 @@ struct TALER_MERCHANT_TransferData
/**
* Time of the wire transfer, according to the exchange.
+ * 0 for not provided by the exchange.
*/
struct GNUNET_TIME_Absolute execution_time;
/**
- * Did we check the exchange's answer and are happy about it? False
- * if we did not check or are unhappy with the answer.
+ * Did we check the exchange's answer and are happy about it? False if we
+ * did not check or are unhappy with the answer.
*/
bool verified;
/**
- * Did we confirm the wire transfer happened (via
#TALER_MERCHANT_transfers_post())?
+ * Did we confirm the wire transfer happened (via
+ * #TALER_MERCHANT_transfers_post())?
*/
bool confirmed;
diff --git a/src/lib/merchant_api_get_transfers.c
b/src/lib/merchant_api_get_transfers.c
index 481f7ab..90dce5d 100644
--- a/src/lib/merchant_api_get_transfers.c
+++ b/src/lib/merchant_api_get_transfers.c
@@ -130,8 +130,6 @@ handle_transfers_get_finished (void *cls,
struct TALER_MERCHANT_TransferData);
ok = true;
json_array_foreach (transfers, i, transfer) {
- /* FIXME: handle 'execution_time', 'verified', and/or 'confirmed'
- not present in the response. */
struct TALER_MERCHANT_TransferData *td = &tds[i];
struct GNUNET_JSON_Specification ispec[] = {
TALER_JSON_spec_amount ("credit_amount",
@@ -144,12 +142,15 @@ handle_transfers_get_finished (void *cls,
&td->exchange_url),
GNUNET_JSON_spec_uint64 ("transfer_serial_id",
&td->credit_serial),
+ GNUNET_JSON_spec_mark_optional (
TALER_JSON_spec_absolute_time ("execution_time",
- &td->execution_time),
+ &td->execution_time)),
+ GNUNET_JSON_spec_mark_optional (
GNUNET_JSON_spec_bool ("verified",
- &td->verified),
+ &td->verified)),
+ GNUNET_JSON_spec_mark_optional (
GNUNET_JSON_spec_bool ("confirmed",
- &td->confirmed),
+ &td->confirmed)),
GNUNET_JSON_spec_end ()
};
diff --git a/src/lib/merchant_api_merchant_get_order.c
b/src/lib/merchant_api_merchant_get_order.c
index ae35f35..62510a6 100644
--- a/src/lib/merchant_api_merchant_get_order.c
+++ b/src/lib/merchant_api_merchant_get_order.c
@@ -277,7 +277,7 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle
*omgh,
GNUNET_JSON_spec_uint32 ("code",
&c32),
GNUNET_JSON_spec_string ("hint",
- &wr->hint), /* FIXME: should return "detail"
instead! */
+ &wr->hint),
GNUNET_JSON_spec_uint32 ("exchange_ec",
&eec32),
GNUNET_JSON_spec_uint32 ("exchange_hc",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: address FIXMEs: support args being optional, detail does not exist in reply, so remove obsolete FIXME,
gnunet <=