From 3528056f9afa9b540ba4ca3f57eb581e5b514540 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 1 May 2020 19:53:54 +0200 Subject: 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(-) (limited to 'src/backend') 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 e6e8e406..7072a5a2 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 99e2a584..9d3c5c0a 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", -- cgit v1.2.3