From d37d9d9ded72e63149efc96b6107d0edee3683a9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 24 Aug 2022 10:16:25 +0200 Subject: -handle case of GET purse status prior to merge --- src/lib/exchange_api_purses_get.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/lib/exchange_api_purses_get.c') diff --git a/src/lib/exchange_api_purses_get.c b/src/lib/exchange_api_purses_get.c index 021954c2..16b0e223 100644 --- a/src/lib/exchange_api_purses_get.c +++ b/src/lib/exchange_api_purses_get.c @@ -94,11 +94,14 @@ handle_purse_get_finished (void *cls, break; case MHD_HTTP_OK: { + bool no_merge = false; struct TALER_ExchangePublicKeyP exchange_pub; struct TALER_ExchangeSignatureP exchange_sig; struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_timestamp ("merge_timestamp", - &dr.details.success.merge_timestamp), + GNUNET_JSON_spec_mark_optional ( + GNUNET_JSON_spec_timestamp ("merge_timestamp", + &dr.details.success.merge_timestamp), + &no_merge), GNUNET_JSON_spec_timestamp ("deposit_timestamp", &dr.details.success.deposit_timestamp), TALER_JSON_spec_amount_any ("balance", -- cgit v1.2.3