exchange

commit 330d99b5c80e9bacb06230be6b29a33eed52080d
parent d0eef446f63cc40ab304ca8eb358d0a285cdf4b1
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  2 Mar 2025 02:58:11 +0100

clean up header include structure

Diffstat:
M
src/exchange/taler-exchange-httpd_common_kyc.h
 | 
1
+
M
src/include/taler_extensions_policy.h
 | 
2
+-
M
src/include/taler_json_lib.h
 | 
1
-
M
src/include/taler_kyclogic_lib.h
 | 
83
+------------------------------------------------------------------------------
M
src/include/taler_util.h
 | 
81
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
src/mhd/Makefile.am
 | 
2
+-

6 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_common_kyc.h b/src/exchange/taler-exchange-httpd_common_kyc.h
@@ -26,6 +26,7 @@
 #include <jansson.h>
 #include <microhttpd.h>
 #include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler-exchange-httpd.h"
 
diff --git a/src/include/taler_extensions_policy.h b/src/include/taler_extensions_policy.h
@@ -23,7 +23,7 @@
 
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_util.h"
-#include "taler_mhd_lib.h"
+
 
 /*
  * @brief Describes the states of fulfillment of a policy bound to a deposit
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
@@ -26,7 +26,6 @@
 #include <gnunet/gnunet_json_lib.h>
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_util.h"
-#include "taler_kyclogic_lib.h"
 #include "taler_error_codes.h"
 
 /**
diff --git a/src/include/taler_kyclogic_lib.h b/src/include/taler_kyclogic_lib.h
@@ -21,93 +21,12 @@
 #ifndef TALER_KYCLOGIC_LIB_H
 #define TALER_KYCLOGIC_LIB_H
 
-#include <microhttpd.h>
 #include "taler_exchangedb_plugin.h"
+#include "taler_util.h"
 #include "taler_kyclogic_plugin.h"
 
 
 /**
- * Enumeration of possible events that may trigger
- * KYC requirements.
- */
-enum TALER_KYCLOGIC_KycTriggerEvent
-{
-
-  /**
-   * Reserved value for invalid event types.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_NONE = 0,
-
-  /**
-   * Customer withdraws coins.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_WITHDRAW = 1,
-
-  /**
-   * Merchant deposits coins.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT = 2,
-
-  /**
-   * Wallet receives P2P payment.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE = 3,
-
-  /**
-   * Wallet balance exceeds threshold. The timeframe is
-   * irrelevant for this limit.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE = 4,
-
-  /**
-   * Reserve is being closed by force.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE = 5,
-
-  /**
-   * Deposits have been aggregated, we are wiring a
-   * certain amount into a (merchant) bank account.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_AGGREGATE = 6,
-
-  /**
-   * Limit per transaction.  The timeframe is
-   * irrelevant for this limit.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_TRANSACTION = 7,
-
-  /**
-   * Limit per refund.  The timeframe is
-   * irrelevant for this limit.
-   */
-  TALER_KYCLOGIC_KYC_TRIGGER_REFUND = 8
-
-};
-
-
-/**
- * Types of KYC checks.
- */
-enum TALER_KYCLOGIC_CheckType
-{
-  /**
-   * Wait for staff or contact staff out-of-band.
-   */
-  TALER_KYCLOGIC_CT_INFO,
-
-  /**
-   * SPA should show an inline form.
-   */
-  TALER_KYCLOGIC_CT_FORM,
-
-  /**
-   * SPA may start external KYC process.
-   */
-  TALER_KYCLOGIC_CT_LINK
-};
-
-
-/**
  * KYC measure that can be taken.
  */
 struct TALER_KYCLOGIC_Measure
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
@@ -689,6 +689,87 @@ enum TALER_EXCHANGE_KycLongPollTarget
 
 
 /**
+ * Enumeration of possible events that may trigger
+ * KYC requirements.
+ */
+enum TALER_KYCLOGIC_KycTriggerEvent
+{
+
+  /**
+   * Reserved value for invalid event types.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_NONE = 0,
+
+  /**
+   * Customer withdraws coins.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_WITHDRAW = 1,
+
+  /**
+   * Merchant deposits coins.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT = 2,
+
+  /**
+   * Wallet receives P2P payment.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE = 3,
+
+  /**
+   * Wallet balance exceeds threshold. The timeframe is
+   * irrelevant for this limit.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE = 4,
+
+  /**
+   * Reserve is being closed by force.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE = 5,
+
+  /**
+   * Deposits have been aggregated, we are wiring a
+   * certain amount into a (merchant) bank account.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_AGGREGATE = 6,
+
+  /**
+   * Limit per transaction.  The timeframe is
+   * irrelevant for this limit.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_TRANSACTION = 7,
+
+  /**
+   * Limit per refund.  The timeframe is
+   * irrelevant for this limit.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_REFUND = 8
+
+};
+
+
+/**
+ * Types of KYC checks.
+ */
+enum TALER_KYCLOGIC_CheckType
+{
+  /**
+   * Wait for staff or contact staff out-of-band.
+   */
+  TALER_KYCLOGIC_CT_INFO,
+
+  /**
+   * SPA should show an inline form.
+   */
+  TALER_KYCLOGIC_CT_FORM,
+
+  /**
+   * SPA may start external KYC process.
+   */
+  TALER_KYCLOGIC_CT_LINK
+};
+
+
+/**
  * Possible values for a binary filter.
  */
 enum TALER_EXCHANGE_YesNoAll
diff --git a/src/mhd/Makefile.am b/src/mhd/Makefile.am
@@ -34,6 +34,7 @@ libtalermhd_la_LIBADD = \
 if HAVE_MHD2
 lib_LTLIBRARIES += \
   libtalermhd2.la
+endif
 
 libtalermhd2_la_SOURCES = \
   mhd_config.c \
@@ -54,4 +55,3 @@ libtalermhd2_la_LIBADD = \
   -ljansson \
   -lz \
   $(XLIB)
-endif