taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marcello Stanisci 2019-01-28 16:48:27 +01:00
parent 32a47928e9
commit 64de8a0fe6
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/auditor/taler-auditor-httpd_deposit-confirmation.c
View File

@ -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 ()
};

8
src/lib/auditor_api_deposit_confirmation.c
View File

@ -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);