From ba3b53cd271f09d25f416c64da30e58dd863eaa7 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 2 Feb 2023 22:21:44 +0100 Subject: [PATCH] -refund deadline should be optional/can be 0 --- src/auditor/taler-auditor-httpd_deposit-confirmation.c | 10 +++++++--- src/lib/auditor_api_deposit_confirmation.c | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c index c7bb4f509..a19e7c1ff 100644 --- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c +++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c @@ -271,7 +271,9 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, const char *upload_data, size_t *upload_data_size) { - struct TALER_AUDITORDB_DepositConfirmation dc; + struct TALER_AUDITORDB_DepositConfirmation dc = { + .refund_deadline = GNUNET_TIME_UNIT_ZERO_TS + }; struct TALER_AUDITORDB_ExchangeSigningKey es; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_fixed_auto ("h_contract_terms", @@ -282,8 +284,10 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, &dc.h_wire), GNUNET_JSON_spec_timestamp ("exchange_timestamp", &dc.exchange_timestamp), - GNUNET_JSON_spec_timestamp ("refund_deadline", - &dc.refund_deadline), + GNUNET_JSON_spec_mark_optional ( + GNUNET_JSON_spec_timestamp ("refund_deadline", + &dc.refund_deadline), + NULL), GNUNET_JSON_spec_timestamp ("wire_deadline", &dc.wire_deadline), TALER_JSON_spec_amount ("amount_without_fee", diff --git a/src/lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c index 82537e25a..afbeda75a 100644 --- a/src/lib/auditor_api_deposit_confirmation.c +++ b/src/lib/auditor_api_deposit_confirmation.c @@ -296,8 +296,9 @@ TALER_AUDITOR_deposit_confirmation ( h_contract_terms), GNUNET_JSON_pack_timestamp ("exchange_timestamp", exchange_timestamp), - GNUNET_JSON_pack_timestamp ("refund_deadline", - refund_deadline), + GNUNET_JSON_pack_allow_null ( + GNUNET_JSON_pack_timestamp ("refund_deadline", + refund_deadline)), GNUNET_JSON_pack_timestamp ("wire_deadline", wire_deadline), TALER_JSON_pack_amount ("amount_without_fee",