summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-08-24 10:16:25 +0200
committerChristian Grothoff <christian@grothoff.org>2022-08-24 10:16:25 +0200
commitd37d9d9ded72e63149efc96b6107d0edee3683a9 (patch)
tree4b7922214f967566ff23671d002b7b38b60c989e /src/lib
parentbc107b59587d0f98d278c958ba775e215312b618 (diff)
downloadexchange-d37d9d9ded72e63149efc96b6107d0edee3683a9.tar.gz
exchange-d37d9d9ded72e63149efc96b6107d0edee3683a9.tar.bz2
exchange-d37d9d9ded72e63149efc96b6107d0edee3683a9.zip
-handle case of GET purse status prior to merge
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/exchange_api_purses_get.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/exchange_api_purses_get.c b/src/lib/exchange_api_purses_get.c
index 021954c2d..16b0e223e 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",