merchant

commit 3528056f9afa9b540ba4ca3f57eb581e5b514540
parent 9b18406bc43bb2bb2d0c62526f2dcf9d1a4c043c
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  1 May 2020 19:53:54 +0200

adapt to exchangev8 protocol

Diffstat:
M
src/backend/taler-merchant-httpd_post-orders-ID-abort.c
 | 
8
--------
M
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
@@ -85,11 +85,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
@@ -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",