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

-handle case of GET purse status prior to merge

Browse Source
This commit is contained in:
Christian Grothoff 2022-08-24 10:16:25 +02:00
parent bc107b5958
commit d37d9d9ded
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/exchange/taler-exchange-httpd_purses_get.c
View File

@ -428,8 +428,9 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
&exchange_sig), &exchange_sig),
GNUNET_JSON_pack_data_auto ("exchange_pub", GNUNET_JSON_pack_data_auto ("exchange_pub",
&exchange_pub), &exchange_pub),
GNUNET_JSON_pack_timestamp ("merge_timestamp", GNUNET_JSON_pack_allow_null (
gc->merge_timestamp), GNUNET_JSON_pack_timestamp ("merge_timestamp",
gc->merge_timestamp)),
GNUNET_JSON_pack_timestamp ("deposit_timestamp", GNUNET_JSON_pack_timestamp ("deposit_timestamp",
dt) dt)
); );

7
src/lib/exchange_api_purses_get.c
View File

@ -94,11 +94,14 @@ handle_purse_get_finished (void *cls,
break; break;
case MHD_HTTP_OK: case MHD_HTTP_OK:
{ {
bool no_merge = false;
struct TALER_ExchangePublicKeyP exchange_pub; struct TALER_ExchangePublicKeyP exchange_pub;
struct TALER_ExchangeSignatureP exchange_sig; struct TALER_ExchangeSignatureP exchange_sig;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_timestamp ("merge_timestamp", GNUNET_JSON_spec_mark_optional (
&dr.details.success.merge_timestamp), GNUNET_JSON_spec_timestamp ("merge_timestamp",
&dr.details.success.merge_timestamp),
&no_merge),
GNUNET_JSON_spec_timestamp ("deposit_timestamp", GNUNET_JSON_spec_timestamp ("deposit_timestamp",
&dr.details.success.deposit_timestamp), &dr.details.success.deposit_timestamp),
TALER_JSON_spec_amount_any ("balance", TALER_JSON_spec_amount_any ("balance",