diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-10-20 15:09:18 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-10-20 15:09:18 +0200 |
| commit | 8dbd57d61b5b6e02e9472a1d4c90597108b242fc (patch) | |
| tree | e7ac41914a0c55cccb578a3fc5475cab14f6d96e /src/backend/taler-merchant-httpd_contract.c | |
| parent | f02036b3cb59135c5df2fda57627e42f344b5a96 (diff) | |
| parent | 28542396565a8c3feb9b8a34be68410373022b6e (diff) | |
Merge branch 'master' of git+ssh://taler.net/merchant
Diffstat (limited to 'src/backend/taler-merchant-httpd_contract.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_contract.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c index d2ded00b..0e8c9426 100644 --- a/src/backend/taler-merchant-httpd_contract.c +++ b/src/backend/taler-merchant-httpd_contract.c @@ -156,7 +156,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh, json_t *products; struct GNUNET_TIME_Absolute timestamp; struct GNUNET_TIME_Absolute refund_deadline; - struct GNUNET_TIME_Absolute expiry; + struct GNUNET_TIME_Absolute pay_deadline; struct GNUNET_JSON_Specification spec[] = { TALER_JSON_spec_amount ("amount", &total), TALER_JSON_spec_amount ("max_fee", &max_fee), @@ -166,7 +166,7 @@ MH_handler_contract (struct TMH_RequestHandler *rh, GNUNET_JSON_spec_json ("products", &products), GNUNET_JSON_spec_absolute_time ("timestamp", ×tamp), GNUNET_JSON_spec_absolute_time ("refund_deadline", &refund_deadline), - GNUNET_JSON_spec_absolute_time ("expiry", &expiry), + GNUNET_JSON_spec_absolute_time ("pay_deadline", &pay_deadline), GNUNET_JSON_spec_end() }; |