diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-10-30 16:26:28 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-10-30 16:26:28 +0100 |
| commit | df8395e9c528a3eed89ce0814bc8b5c37daae267 (patch) | |
| tree | d93b71112a424c46fdbaebf603141d072912aa29 /src | |
| parent | 5b311d513626a4ecf82132c62860b3eff745edd5 (diff) | |
| download | merchant-df8395e9c528a3eed89ce0814bc8b5c37daae267.tar.gz merchant-df8395e9c528a3eed89ce0814bc8b5c37daae267.tar.bz2 merchant-df8395e9c528a3eed89ce0814bc8b5c37daae267.zip | |
address FIXMEs: support args being optional, detail does not exist in reply, so remove obsolete FIXME
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/taler_merchant_service.h | 8 | ||||
| -rw-r--r-- | src/lib/merchant_api_get_transfers.c | 11 | ||||
| -rw-r--r-- | src/lib/merchant_api_merchant_get_order.c | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 7c757c71..656ae76e 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -2674,17 +2674,19 @@ struct TALER_MERCHANT_TransferData /** * Time of the wire transfer, according to the exchange. + * 0 for not provided by the exchange. */ struct GNUNET_TIME_Absolute execution_time; /** - * Did we check the exchange's answer and are happy about it? False - * if we did not check or are unhappy with the answer. + * Did we check the exchange's answer and are happy about it? False if we + * did not check or are unhappy with the answer. */ bool verified; /** - * Did we confirm the wire transfer happened (via #TALER_MERCHANT_transfers_post())? + * Did we confirm the wire transfer happened (via + * #TALER_MERCHANT_transfers_post())? */ bool confirmed; diff --git a/src/lib/merchant_api_get_transfers.c b/src/lib/merchant_api_get_transfers.c index 481f7abd..90dce5d5 100644 --- a/src/lib/merchant_api_get_transfers.c +++ b/src/lib/merchant_api_get_transfers.c @@ -130,8 +130,6 @@ handle_transfers_get_finished (void *cls, struct TALER_MERCHANT_TransferData); ok = true; json_array_foreach (transfers, i, transfer) { - /* FIXME: handle 'execution_time', 'verified', and/or 'confirmed' - not present in the response. */ struct TALER_MERCHANT_TransferData *td = &tds[i]; struct GNUNET_JSON_Specification ispec[] = { TALER_JSON_spec_amount ("credit_amount", @@ -144,12 +142,15 @@ handle_transfers_get_finished (void *cls, &td->exchange_url), GNUNET_JSON_spec_uint64 ("transfer_serial_id", &td->credit_serial), + GNUNET_JSON_spec_mark_optional ( TALER_JSON_spec_absolute_time ("execution_time", - &td->execution_time), + &td->execution_time)), + GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_bool ("verified", - &td->verified), + &td->verified)), + GNUNET_JSON_spec_mark_optional ( GNUNET_JSON_spec_bool ("confirmed", - &td->confirmed), + &td->confirmed)), GNUNET_JSON_spec_end () }; diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c index ae35f354..62510a6c 100644 --- a/src/lib/merchant_api_merchant_get_order.c +++ b/src/lib/merchant_api_merchant_get_order.c @@ -277,7 +277,7 @@ handle_paid (struct TALER_MERCHANT_OrderMerchantGetHandle *omgh, GNUNET_JSON_spec_uint32 ("code", &c32), GNUNET_JSON_spec_string ("hint", - &wr->hint), /* FIXME: should return "detail" instead! */ + &wr->hint), GNUNET_JSON_spec_uint32 ("exchange_ec", &eec32), GNUNET_JSON_spec_uint32 ("exchange_hc", |