clean up logic: use new EXCHANGE_YNA enum, avoid crazy macro construction to build URLs, use full power of TALER_url_join() instead

1 files changed, 7 insertions, 34 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 6a401ae1..4df40afa 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -1252,28 +1252,6 @@ TALER_MERCHANT_orders_get (
 
 
 /**
- * Possible values for a binary filter.
- */
-enum TALER_MERCHANT_YesNoAll
-{
-  /**
-   * If condition is yes.
-   */
-  TALER_MERCHANT_YNA_YES = 1,
-
-  /**
-  * If condition is no.
-  */
-  TALER_MERCHANT_YNA_NO = 2,
-
-  /**
-   * Condition disabled.
-   */
-  TALER_MERCHANT_YNA_ALL = 3
-};
-
-
-/**
  * Make a GET /orders request with filters.
  *
  * @param ctx the context
@@ -1295,9 +1273,9 @@ struct TALER_MERCHANT_OrdersGetHandle *
 TALER_MERCHANT_orders_get2 (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
-  enum TALER_MERCHANT_YesNoAll paid,
-  enum TALER_MERCHANT_YesNoAll refunded,
-  enum TALER_MERCHANT_YesNoAll wired,
+  enum TALER_EXCHANGE_YesNoAll paid,
+  enum TALER_EXCHANGE_YesNoAll refunded,
+  enum TALER_EXCHANGE_YesNoAll wired,
   struct GNUNET_TIME_Absolute date,
   uint64_t start_row,
   int64_t delta,
@@ -1351,11 +1329,6 @@ struct TALER_MERCHANT_RefundDetail
   struct TALER_Amount refund_amount;
 
   /**
-   * Applicable refund transaction fee.
-   */
-  struct TALER_Amount refund_fee;
-
-  /**
    * Public key of the exchange affirming the refund,
    * only valid if the @e hr http_status is #MHD_HTTP_OK.
    */
@@ -2402,7 +2375,7 @@ TALER_MERCHANT_transfers_get (
   const struct GNUNET_TIME_Absolute after,
   int64_t limit,
   uint64_t offset,
-  enum TALER_MERCHANT_YesNoAll verified,
+  enum TALER_EXCHANGE_YesNoAll verified,
   TALER_MERCHANT_GetTransfersCallback cb,
   void *cb_cls);
 
@@ -2566,8 +2539,8 @@ struct TALER_MERCHANT_ReservesGetHandle *
 TALER_MERCHANT_reserves_get (struct GNUNET_CURL_Context *ctx,
                              const char *backend_url,
                              struct GNUNET_TIME_Absolute after,
-                             enum TALER_MERCHANT_YesNoAll active,
-                             enum TALER_MERCHANT_YesNoAll failures,
+                             enum TALER_EXCHANGE_YesNoAll active,
+                             enum TALER_EXCHANGE_YesNoAll failures,
                              TALER_MERCHANT_ReservesGetCallback cb,
                              void *cb_cls);
 
@@ -2945,7 +2918,7 @@ TALER_MERCHANT_tips_get (struct GNUNET_CURL_Context *ctx,
 struct TALER_MERCHANT_TipsGetHandle *
 TALER_MERCHANT_tips_get2 (struct GNUNET_CURL_Context *ctx,
                           const char *backend_url,
-                          enum TALER_MERCHANT_YesNoAll expired,
+                          enum TALER_EXCHANGE_YesNoAll expired,
                           int64_t limit,
                           uint64_t offset,
                           TALER_MERCHANT_TipsGetCallback cb,