From df8395e9c528a3eed89ce0814bc8b5c37daae267 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 30 Oct 2020 16:26:28 +0100
Subject: address FIXMEs: support args being optional, detail does not exist in
 reply, so remove obsolete FIXME

---
 src/lib/merchant_api_get_transfers.c      | 11 ++++++-----
 src/lib/merchant_api_merchant_get_order.c |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/merchant_api_get_transfers.c b/src/lib/merchant_api_get_transfers.c
index 481f7abd..90dce5d5 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 ae35f354..62510a6c 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",
-- 
cgit v1.2.3