diff options
| author | Florian Dold <florian.dold@gmail.com> | 2019-11-29 21:22:41 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2019-11-29 21:22:41 +0100 |
| commit | c94e3367ff358723a7ad3c0c9e78ae98a3f50606 (patch) | |
| tree | 2f4bbf48405d8bc904b54989924a17a4ee0ccb36 | |
| parent | 5df378f17de3a6a71fd33567c17b8560ca4ae41e (diff) | |
| download | merchant-c94e3367ff358723a7ad3c0c9e78ae98a3f50606.tar.gz merchant-c94e3367ff358723a7ad3c0c9e78ae98a3f50606.tar.bz2 merchant-c94e3367ff358723a7ad3c0c9e78ae98a3f50606.zip | |
make wire_transfer_deadline absolute again in /pay as well
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index 7e363c1f..4c17f5a9 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -1435,7 +1435,6 @@ parse_pay (struct MHD_Connection *connection, const char *mode; struct TALER_MerchantPublicKeyP merchant_pub; int res; - struct GNUNET_TIME_Relative wire_transfer_deadline_rel; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_string ("mode", &mode), @@ -1565,7 +1564,7 @@ parse_pay (struct MHD_Connection *connection, GNUNET_JSON_spec_absolute_time ("pay_deadline", &pc->pay_deadline), GNUNET_JSON_spec_relative_time ("wire_transfer_deadline", - &wire_transfer_deadline_rel), + &pc->wire_transfer_deadline_rel), GNUNET_JSON_spec_absolute_time ("timestamp", &pc->timestamp), TALER_JSON_spec_amount ("max_fee", @@ -1591,9 +1590,6 @@ parse_pay (struct MHD_Connection *connection, pc->fulfillment_url = GNUNET_strdup (fulfillment_url); - pc->wire_transfer_deadline = GNUNET_TIME_relative_to_absolute ( - wire_transfer_deadline_rel); - if (pc->wire_transfer_deadline.abs_value_us < pc->refund_deadline.abs_value_us) { |