exchange

commit 64de8a0fe6cffc0ffe35083397981618ff7bd78f
parent 32a47928e94b77aaa8c0e47f0b0f395517e28780
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Mon, 28 Jan 2019 16:48:27 +0100

Fix /deposit-confirmation as per JSON encode/decode.

Diffstat:
M
src/auditor/taler-auditor-httpd_deposit-confirmation.c
 | 
6
+++---
M
src/lib/auditor_api_deposit_confirmation.c
 | 
8
+++++---

2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
@@ -237,9 +237,9 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh,
     GNUNET_JSON_spec_fixed_auto ("exchange_sig",  &dc.exchange_sig),
     GNUNET_JSON_spec_fixed_auto ("exchange_pub",  &dc.exchange_pub),
     GNUNET_JSON_spec_fixed_auto ("master_pub",  &es.master_public_key),
-    GNUNET_JSON_spec_fixed_auto ("ep_start",  &es.ep_start),
-    GNUNET_JSON_spec_fixed_auto ("ep_expire",  &es.ep_expire),
-    GNUNET_JSON_spec_fixed_auto ("ep_end",  &es.ep_end),
+    GNUNET_JSON_spec_absolute_time ("ep_start",  &es.ep_start),
+    GNUNET_JSON_spec_absolute_time ("ep_expire",  &es.ep_expire),
+    GNUNET_JSON_spec_absolute_time ("ep_end",  &es.ep_end),
     GNUNET_JSON_spec_fixed_auto ("master_sig",  &es.master_sig),
     GNUNET_JSON_spec_end ()
   };
diff --git a/src/lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c
@@ -309,8 +309,8 @@ TALER_AUDITOR_deposit_confirmation (struct TALER_AUDITOR_Handle *auditor,
 		 " s:o, s:o," /* merchant_pub, exchange_sig */
 		 " s:o, s:o," /* master_pub, ep_start */
 		 " s:o, s:o," /* ep_expire, ep_end */
-                 " s:o}",     /* master_sig */
-		 "h_wire", GNUNET_JSON_from_data_auto (&h_wire),
+                 " s:o, s:o}", /* master_sig, exchange_pub */
+		 "h_wire", GNUNET_JSON_from_data_auto (h_wire),
 		 "h_contract_terms", GNUNET_JSON_from_data_auto (h_contract_terms),
 		 "timestamp", GNUNET_JSON_from_time_abs (timestamp),
 		 "refund_deadline", GNUNET_JSON_from_time_abs (refund_deadline),
@@ -322,7 +322,9 @@ TALER_AUDITOR_deposit_confirmation (struct TALER_AUDITOR_Handle *auditor,
 		 "ep_start", GNUNET_JSON_from_time_abs (ep_start),
 		 "ep_expire", GNUNET_JSON_from_time_abs (ep_expire),
 		 "ep_end", GNUNET_JSON_from_time_abs (ep_end),
-		 "master_sig", GNUNET_JSON_from_data_auto (master_sig));
+		 "master_sig", GNUNET_JSON_from_data_auto (master_sig),
+		 "exchange_pub", GNUNET_JSON_from_data_auto (exchange_pub));
+
   if (NULL == deposit_confirmation_obj)
   {
     GNUNET_break (0);