[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: make wire_transfer_deadline abso
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: make wire_transfer_deadline absolute again in /pay as well |
Date: |
Fri, 29 Nov 2019 21:22:44 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new c94e336 make wire_transfer_deadline absolute again in /pay as well
c94e336 is described below
commit c94e3367ff358723a7ad3c0c9e78ae98a3f50606
Author: Florian Dold <address@hidden>
AuthorDate: Fri Nov 29 21:22:41 2019 +0100
make wire_transfer_deadline absolute again in /pay as well
---
src/backend/taler-merchant-httpd_pay.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_pay.c
b/src/backend/taler-merchant-httpd_pay.c
index 7e363c1..4c17f5a 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)
{
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: make wire_transfer_deadline absolute again in /pay as well,
gnunet <=