[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 76/277: adapt to exchangev8 protocol
From: |
gnunet |
Subject: |
[taler-merchant] 76/277: adapt to exchangev8 protocol |
Date: |
Sun, 05 Jul 2020 20:49:49 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit 3528056f9afa9b540ba4ca3f57eb581e5b514540
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri May 1 19:53:54 2020 +0200
adapt to exchangev8 protocol
---
src/backend/taler-merchant-httpd_post-orders-ID-abort.c | 8 --------
src/backend/taler-merchant-httpd_private-post-orders.c | 2 ++
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
index e6e8e40..7072a5a 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
@@ -84,11 +84,6 @@ struct RefundDetails
*/
struct TALER_Amount amount_with_fee;
- /**
- * Fee charged by the exchange for the refund operation of this coin.
- */
- struct TALER_Amount refund_fee;
-
/**
* Offset of this coin into the `rd` array of all coins in the
* @e ac.
@@ -528,7 +523,6 @@ process_abort_with_exchange (void *cls,
ac->pending--;
rdi->rh = TALER_EXCHANGE_refund (exchange_handle,
&rdi->amount_with_fee,
- &rdi->refund_fee,
&ac->h_contract_terms,
&rdi->coin_pub,
0, /* rtransaction_id */
@@ -875,8 +869,6 @@ parse_abort (struct MHD_Connection *connection,
struct GNUNET_JSON_Specification ispec[] = {
TALER_JSON_spec_amount ("contribution",
&rd->amount_with_fee),
- TALER_JSON_spec_amount ("refund_fee",
- &rd->refund_fee),
GNUNET_JSON_spec_string ("exchange_url",
&exchange_url),
GNUNET_JSON_spec_fixed_auto ("coin_pub",
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c
b/src/backend/taler-merchant-httpd_private-post-orders.c
index 99e2a58..9d3c5c0 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -553,6 +553,8 @@ patch_order (struct MHD_Connection *connection,
{
struct GNUNET_TIME_Absolute zero = { 0 };
+ // FIXME: #5957: add way to compute non-zero refund deadline
+ // from 'refund delay' specified "somewhere".
GNUNET_assert (0 ==
json_object_set_new (order,
"refund_deadline",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 70/277: work on /pay and /abort processing, (continued)
- [taler-merchant] 70/277: work on /pay and /abort processing, gnunet, 2020/07/05
- [taler-merchant] 72/277: DB API for /abort, gnunet, 2020/07/05
- [taler-merchant] 77/277: POST /orders/ID/refund implementation, gnunet, 2020/07/05
- [taler-merchant] 79/277: backend code for /refund handling, gnunet, 2020/07/05
- [taler-merchant] 85/277: update testing logic for order CMDs, gnunet, 2020/07/05
- [taler-merchant] 89/277: fix benchmark FTBFS, gnunet, 2020/07/05
- [taler-merchant] 63/277: remove duplicate, gnunet, 2020/07/05
- [taler-merchant] 71/277: work on /abort logic, gnunet, 2020/07/05
- [taler-merchant] 58/277: implement GET /orders in libtalermerchant, gnunet, 2020/07/05
- [taler-merchant] 66/277: implement order claiming, gnunet, 2020/07/05
- [taler-merchant] 76/277: adapt to exchangev8 protocol,
gnunet <=
- [taler-merchant] 73/277: DB API for /abort, gnunet, 2020/07/05
- [taler-merchant] 75/277: work on abort, gnunet, 2020/07/05
- [taler-merchant] 83/277: renaming, gnunet, 2020/07/05
- [taler-merchant] 78/277: work on refund, gnunet, 2020/07/05
- [taler-merchant] 84/277: dce, gnunet, 2020/07/05
- [taler-merchant] 82/277: implement abort client lib, gnunet, 2020/07/05
- [taler-merchant] 87/277: revise GET /private/orders API, gnunet, 2020/07/05
- [taler-merchant] 86/277: GET /orders/ID API design, gnunet, 2020/07/05
- [taler-merchant] 88/277: fix benchmark FTBFS, gnunet, 2020/07/05
- [taler-merchant] 95/277: db work for POST /transfers, gnunet, 2020/07/05