diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/exchange_api_handle.c | 6 | ||||
| -rw-r--r-- | src/lib/exchange_api_purse_create_with_merge.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index 6528c56d1..0ad8e5b79 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -521,13 +521,13 @@ parse_global_fee (struct TALER_EXCHANGE_GlobalFee *gf, const struct TALER_EXCHANGE_Keys *key_data) { struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_timestamp ("start_time", + GNUNET_JSON_spec_timestamp ("start_date", &gf->start_date), - GNUNET_JSON_spec_timestamp ("end_time", + GNUNET_JSON_spec_timestamp ("end_date", &gf->end_date), GNUNET_JSON_spec_relative_time ("purse_timeout", &gf->purse_timeout), - GNUNET_JSON_spec_relative_time ("kyc_timeout", + GNUNET_JSON_spec_relative_time ("account_kyc_timeout", &gf->kyc_timeout), GNUNET_JSON_spec_relative_time ("history_expiration", &gf->history_expiration), diff --git a/src/lib/exchange_api_purse_create_with_merge.c b/src/lib/exchange_api_purse_create_with_merge.c index acf60ceee..c1ccf7b89 100644 --- a/src/lib/exchange_api_purse_create_with_merge.c +++ b/src/lib/exchange_api_purse_create_with_merge.c @@ -294,7 +294,6 @@ TALER_EXCHANGE_purse_create_with_merge ( &contract_pub.ecdhe_pub); { - // FIXME: get purse expiration time from contract? struct GNUNET_JSON_Specification spec[] = { TALER_JSON_spec_amount_any ("amount", &pcm->purse_value_after_fees), @@ -302,8 +301,7 @@ TALER_EXCHANGE_purse_create_with_merge ( GNUNET_JSON_spec_uint32 ("minimum_age", &min_age), NULL), - // FIXME: correct field name? - GNUNET_JSON_spec_timestamp ("payment_deadline", + GNUNET_JSON_spec_timestamp ("pay_deadline", &pcm->purse_expiration), GNUNET_JSON_spec_end () }; |