moved yna to exchange

1 files changed, 7 insertions, 29 deletions

diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 2fb231dc..2f796747 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -220,28 +220,6 @@ struct TALER_MERCHANTDB_ProductDetails
 
 
 /**
- * Possible values for a binary filter.
- */
-enum TALER_MERCHANTDB_YesNoAll
-{
-  /**
-   * If condition is yes.
-   */
-  TALER_MERCHANTDB_YNA_YES = 1,
-
-  /**
-  * If condition is no.
-  */
-  TALER_MERCHANTDB_YNA_NO = 2,
-
-  /**
-   * Condition disabled.
-   */
-  TALER_MERCHANTDB_YNA_ALL = 3
-};
-
-
-/**
  * Filter preferences.
  */
 struct TALER_MERCHANTDB_OrderFilter
@@ -249,17 +227,17 @@ struct TALER_MERCHANTDB_OrderFilter
   /**
    * Filter by payment status.
    */
-  enum TALER_MERCHANTDB_YesNoAll paid;
+  enum TALER_EXCHANGE_YesNoAll paid;
 
   /**
    * Filter by refund status.
    */
-  enum TALER_MERCHANTDB_YesNoAll refunded;
+  enum TALER_EXCHANGE_YesNoAll refunded;
 
   /**
    * Filter by wire transfer status.
    */
-  enum TALER_MERCHANTDB_YesNoAll wired;
+  enum TALER_EXCHANGE_YesNoAll wired;
 
   /**
    * Filter orders by date, exact meaning depends on @e delta.
@@ -1626,7 +1604,7 @@ struct TALER_MERCHANTDB_Plugin
                       struct GNUNET_TIME_Absolute after,
                       int64_t limit,
                       uint64_t offset,
-                      enum TALER_MERCHANTDB_YesNoAll yna,
+                      enum TALER_EXCHANGE_YesNoAll yna,
                       TALER_MERCHANTDB_TransferCallback cb,
                       void *cb_cls);
 
@@ -1721,8 +1699,8 @@ struct TALER_MERCHANTDB_Plugin
   (*lookup_reserves)(void *cls,
                      const char *instance_id,
                      struct GNUNET_TIME_Absolute created_after,
-                     enum TALER_MERCHANTDB_YesNoAll active,
-                     enum TALER_MERCHANTDB_YesNoAll failures,
+                     enum TALER_EXCHANGE_YesNoAll active,
+                     enum TALER_EXCHANGE_YesNoAll failures,
                      TALER_MERCHANTDB_ReservesCallback cb,
                      void *cb_cls);
 
@@ -1875,7 +1853,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_tips)(void *cls,
                  const char *instance_id,
-                 enum TALER_MERCHANTDB_YesNoAll expired,
+                 enum TALER_EXCHANGE_YesNoAll expired,
                  int64_t limit,
                  uint64_t offset,
                  TALER_MERCHANTDB_TipsCallback cb,