commit fefb8c3f0835de480f34b632f4516c3852bf217c parent c51506dfd9c6432706eedec7bcc41c3e7cbf9cee Author: Christian Grothoff <christian@grothoff.org> Date: Wed, 15 Apr 2026 22:15:01 +0200 rework headers, distinguish more clearly non-installed headers Diffstat:
678 files changed, 1999 insertions(+), 2734 deletions(-)
diff --git a/src/backend/taler-merchant-depositcheck.c b/src/backend/taler-merchant-depositcheck.c @@ -18,7 +18,7 @@ * @brief Process that inquires with the exchange for deposits that should have been wired * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <gnunet/gnunet_util_lib.h> #include <jansson.h> @@ -26,7 +26,7 @@ #include <taler/taler_dbevents.h> #include <taler/taler_exchange_service.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/event_listen.h" #include "merchant-database/lookup_pending_deposits.h" #include "merchant-database/select_exchange_keys.h" diff --git a/src/backend/taler-merchant-donaukeyupdate.c b/src/backend/taler-merchant-donaukeyupdate.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <gnunet/gnunet_util_lib.h> #include <jansson.h> @@ -27,8 +27,8 @@ #include <taler/taler_dbevents.h> #include "donau/donau_service.h" #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" +#include "merchantdb_lib.h" #include "taler/taler_merchant_bank_lib.h" #include "merchant-database/select_all_donau_instances.h" #include "merchant-database/select_donau_instance_by_serial.h" diff --git a/src/backend/taler-merchant-exchangekeyupdate.c b/src/backend/taler-merchant-exchangekeyupdate.c @@ -18,7 +18,7 @@ * @brief Process that ensures our /keys data for all exchanges is current * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <gnunet/gnunet_util_lib.h> #include <jansson.h> @@ -30,7 +30,7 @@ struct Exchange; #include "taler/taler_merchant_util.h" #include "taler/taler_merchant_bank_lib.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/delete_exchange_accounts.h" #include "merchant-database/insert_exchange_keys.h" #include "merchant-database/insert_exchange_signkey.h" diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c @@ -22,7 +22,7 @@ * @author Florian Dold * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_dbevents.h> #include <taler/taler_bank_service.h> #include <taler/taler_mhd_lib.h> diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h @@ -21,8 +21,8 @@ #ifndef TALER_MERCHANT_HTTPD_H #define TALER_MERCHANT_HTTPD_H -#include "taler/platform.h" -#include "taler/taler_merchantdb_lib.h" +#include "platform.h" +#include "merchantdb_lib.h" #include <taler/taler_mhd_lib.h> #include <gnunet/gnunet_mhd_compat.h> #include "taler/taler_merchant_bank_lib.h" diff --git a/src/backend/taler-merchant-httpd_auth.c b/src/backend/taler-merchant-httpd_auth.c @@ -19,7 +19,7 @@ * @author Martin Schanzenbach * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_db_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c @@ -18,7 +18,7 @@ * @brief shared logic for contract terms handling * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <jansson.h> #include <stdint.h> diff --git a/src/backend/taler-merchant-httpd_delete-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_delete-management-instances-INSTANCE.c @@ -18,7 +18,7 @@ * @brief implement DELETE /instances/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-management-instances-INSTANCE.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.c @@ -18,7 +18,7 @@ * @brief implement DELETE /account/$H_WIRE * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-accounts-H_WIRE.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_delete-private-categories-CATEGORY_ID.c b/src/backend/taler-merchant-httpd_delete-private-categories-CATEGORY_ID.c @@ -18,7 +18,7 @@ * @brief implement DELETE /private/categories/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-categories-CATEGORY_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_category.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.c b/src/backend/taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.c @@ -20,7 +20,7 @@ * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-donau-DONAU_SERIAL.h" #include <taler/taler_json_lib.h> #include <taler/taler_error_codes.h> diff --git a/src/backend/taler-merchant-httpd_delete-private-groups-GROUP_ID.c b/src/backend/taler-merchant-httpd_delete-private-groups-GROUP_ID.c @@ -20,7 +20,7 @@ * @brief implementation of DELETE /private/groups/$GROUP_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-groups-GROUP_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_product_group.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_delete-private-orders-ORDER_ID.c @@ -18,7 +18,7 @@ * @brief implement DELETE /orders/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-orders-ORDER_ID.h" #include <stdint.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.c @@ -18,7 +18,7 @@ * @brief implement DELETE /otp-devices/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_otp.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-pots-POT_ID.c b/src/backend/taler-merchant-httpd_delete-private-pots-POT_ID.c @@ -20,7 +20,7 @@ * @brief implementation of DELETE /private/pots/$POT_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-pots-POT_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_money_pot.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-products-PRODUCT_ID.c b/src/backend/taler-merchant-httpd_delete-private-products-PRODUCT_ID.c @@ -18,7 +18,7 @@ * @brief implement DELETE /products/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-products-PRODUCT_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_product.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_delete-private-reports-REPORT_ID.c @@ -20,7 +20,7 @@ * @brief implementation of DELETE /private/reports/$REPORT_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-reports-REPORT_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_report.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_delete-private-templates-TEMPLATE_ID.c @@ -18,7 +18,7 @@ * @brief implement DELETE /templates/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-templates-TEMPLATE_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_template.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-token.c b/src/backend/taler-merchant-httpd_delete-private-token.c @@ -22,7 +22,7 @@ * @brief implementing DELETE /instances/$ID/token request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-token.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_delete-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/backend/taler-merchant-httpd_delete-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -18,7 +18,7 @@ * @brief implement DELETE /tokenfamilies/$SLUG * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-tokenfamilies-TOKEN_FAMILY_SLUG.h" #include <gnunet/gnunet_db_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.c b/src/backend/taler-merchant-httpd_delete-private-tokens-SERIAL.c @@ -22,7 +22,7 @@ * @brief implementing DELETE /instances/$ID/token request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-tokens-SERIAL.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_delete-private-transfers-TID.c b/src/backend/taler-merchant-httpd_delete-private-transfers-TID.c @@ -18,7 +18,7 @@ * @brief implement DELETE /transfers/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-transfers-TID.h" #include <taler/taler_json_lib.h> #include "merchant-database/check_transfer_exists.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-units-UNIT.c b/src/backend/taler-merchant-httpd_delete-private-units-UNIT.c @@ -18,7 +18,7 @@ * @brief implement DELETE /private/units/$UNIT * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-units-UNIT.h" #include "merchant-database/delete_unit.h" diff --git a/src/backend/taler-merchant-httpd_delete-private-webhooks-WEBHOOK_ID.c b/src/backend/taler-merchant-httpd_delete-private-webhooks-WEBHOOK_ID.c @@ -18,7 +18,7 @@ * @brief implement DELETE /webhooks/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_delete-private-webhooks-WEBHOOK_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/delete_webhook.h" diff --git a/src/backend/taler-merchant-httpd_dispatcher.c b/src/backend/taler-merchant-httpd_dispatcher.c @@ -18,7 +18,7 @@ * @brief map requested URL and method to the respective request handler * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-config.h" #include "taler-merchant-httpd_get-exchanges.h" #include "taler-merchant-httpd_dispatcher.h" diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c @@ -19,7 +19,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> #include "taler-merchant-httpd_exchanges.h" diff --git a/src/backend/taler-merchant-httpd_get-config.c b/src/backend/taler-merchant-httpd_get-config.c @@ -18,7 +18,7 @@ * @brief implement API for querying configuration data of the backend * @author Florian Dold */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_util.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-exchanges.c b/src/backend/taler-merchant-httpd_get-exchanges.c @@ -18,7 +18,7 @@ * @brief implement API for querying exchange status * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_util.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_get-management-instances-INSTANCE.c @@ -18,7 +18,7 @@ * @brief implement GET /instances/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-management-instances-INSTANCE.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-management-instances.c b/src/backend/taler-merchant-httpd_get-management-instances.c @@ -18,7 +18,7 @@ * @brief implement GET /instances * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-management-instances.h" /** diff --git a/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.c @@ -19,7 +19,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <gnunet/gnunet_uri_lib.h> #include <gnunet/gnunet_common.h> diff --git a/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.c @@ -18,7 +18,7 @@ * @brief implement GET /accounts/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-accounts-H_WIRE.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_account.h" diff --git a/src/backend/taler-merchant-httpd_get-private-accounts.c b/src/backend/taler-merchant-httpd_get-private-accounts.c @@ -18,7 +18,7 @@ * @brief implement GET /accounts * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-accounts.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_accounts.h" diff --git a/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.c b/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.c @@ -18,7 +18,7 @@ * @brief implement GET /private/categories/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-categories-CATEGORY_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_category.h" diff --git a/src/backend/taler-merchant-httpd_get-private-categories.c b/src/backend/taler-merchant-httpd_get-private-categories.c @@ -18,7 +18,7 @@ * @brief implement GET /categories * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-categories.h" #include "merchant-database/lookup_categories.h" diff --git a/src/backend/taler-merchant-httpd_get-private-donau.c b/src/backend/taler-merchant-httpd_get-private-donau.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_get-private-groups.c b/src/backend/taler-merchant-httpd_get-private-groups.c @@ -20,7 +20,7 @@ * @brief implementation of GET /private/groups * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-groups.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_product_groups.h" diff --git a/src/backend/taler-merchant-httpd_get-private-incoming-ID.c b/src/backend/taler-merchant-httpd_get-private-incoming-ID.c @@ -18,7 +18,7 @@ * @brief implement API for obtaining details about an expected incoming wire transfer * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_json_lib.h> #include "taler-merchant-httpd_get-private-incoming-ID.h" diff --git a/src/backend/taler-merchant-httpd_get-private-incoming.c b/src/backend/taler-merchant-httpd_get-private-incoming.c @@ -18,7 +18,7 @@ * @brief implement API for obtaining a list of expected incoming wire transfers * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_json_lib.h> #include "taler-merchant-httpd_get-private-incoming.h" diff --git a/src/backend/taler-merchant-httpd_get-private-kyc.c b/src/backend/taler-merchant-httpd_get-private-kyc.c @@ -22,7 +22,7 @@ * @brief implementing GET /instances/$ID/kyc request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_exchanges.h" #include "taler-merchant-httpd_get-private-kyc.h" #include "taler-merchant-httpd_helper.h" diff --git a/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.c @@ -21,7 +21,7 @@ * @author Bohdan Potuzhnyi * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> #include <taler/taler_error_codes.h> diff --git a/src/backend/taler-merchant-httpd_get-private-orders.c b/src/backend/taler-merchant-httpd_get-private-orders.c @@ -20,7 +20,7 @@ * * FIXME-cleanup: consider introducing phases / state machine */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-orders.h" #include <taler/taler_merchant_util.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.c @@ -18,7 +18,7 @@ * @brief implement GET /otp-devices/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_otp.h" diff --git a/src/backend/taler-merchant-httpd_get-private-otp-devices.c b/src/backend/taler-merchant-httpd_get-private-otp-devices.c @@ -18,7 +18,7 @@ * @brief implement GET /otp-devices * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-otp-devices.h" #include "merchant-database/lookup_otp_devices.h" diff --git a/src/backend/taler-merchant-httpd_get-private-pos.c b/src/backend/taler-merchant-httpd_get-private-pos.c @@ -18,7 +18,7 @@ * @brief implement GET /private/pos * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-pos.h" #include <taler/taler_json_lib.h> #include "taler-merchant-httpd_helper.h" diff --git a/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.c b/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.c @@ -20,7 +20,7 @@ * @brief implementation of GET /private/pots/$POT_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-pots-POT_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_money_pot.h" diff --git a/src/backend/taler-merchant-httpd_get-private-pots.c b/src/backend/taler-merchant-httpd_get-private-pots.c @@ -20,7 +20,7 @@ * @brief implementation of GET /private/pots * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-pots.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_money_pots.h" diff --git a/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.c b/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.c @@ -18,7 +18,7 @@ * @brief implement GET /products/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-products-PRODUCT_ID.h" #include <taler/taler_json_lib.h> #include "taler-merchant-httpd_helper.h" diff --git a/src/backend/taler-merchant-httpd_get-private-products.c b/src/backend/taler-merchant-httpd_get-private-products.c @@ -18,7 +18,7 @@ * @brief implement GET /products * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-products.h" #include "merchant-database/lookup_products.h" diff --git a/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.c @@ -20,7 +20,7 @@ * @brief implementation of GET /private/reports/$REPORT_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-reports-REPORT_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/select_report.h" diff --git a/src/backend/taler-merchant-httpd_get-private-reports.c b/src/backend/taler-merchant-httpd_get-private-reports.c @@ -20,7 +20,7 @@ * @brief implementation of GET /private/reports * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-reports.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.c b/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.c @@ -18,7 +18,7 @@ * @brief implement GET /statistics-amount/$SLUG/ * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-statistics-amount-SLUG.h" #include <gnunet/gnunet_json_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.c b/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.c @@ -18,7 +18,7 @@ * @brief implement GET /statistics-counter/$SLUG/ * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-statistics-counter-SLUG.h" #include <gnunet/gnunet_json_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c b/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c @@ -18,7 +18,7 @@ * @brief implement GET /statistics-report/transactions * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-statistics-report-transactions.h" #include <gnunet/gnunet_json_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.c @@ -18,7 +18,7 @@ * @brief implement GET /templates/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-templates-TEMPLATE_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/lookup_template.h" diff --git a/src/backend/taler-merchant-httpd_get-private-templates.c b/src/backend/taler-merchant-httpd_get-private-templates.c @@ -18,7 +18,7 @@ * @brief implement GET /templates * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-templates.h" #include "merchant-database/lookup_templates.h" diff --git a/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -18,7 +18,7 @@ * @brief implement GET /tokenfamilies/$SLUG/ * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.h" #include <gnunet/gnunet_json_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-private-tokenfamilies.c b/src/backend/taler-merchant-httpd_get-private-tokenfamilies.c @@ -18,7 +18,7 @@ * @brief implement GET /tokenfamilies * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-tokenfamilies.h" #include "merchant-database/lookup_token_families.h" diff --git a/src/backend/taler-merchant-httpd_get-private-tokens.c b/src/backend/taler-merchant-httpd_get-private-tokens.c @@ -18,7 +18,7 @@ * @brief implement GET /tokens * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_auth.h" #include "taler-merchant-httpd_get-private-tokens.h" #include "merchant-database/lookup_login_tokens.h" diff --git a/src/backend/taler-merchant-httpd_get-private-transfers.c b/src/backend/taler-merchant-httpd_get-private-transfers.c @@ -19,7 +19,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_json_lib.h> #include "taler-merchant-httpd_get-private-transfers.h" diff --git a/src/backend/taler-merchant-httpd_get-private-units-UNIT.c b/src/backend/taler-merchant-httpd_get-private-units-UNIT.c @@ -18,7 +18,7 @@ * @brief implement GET /private/units/$UNIT * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-units-UNIT.h" #include "merchant-database/select_unit.h" diff --git a/src/backend/taler-merchant-httpd_get-private-units.c b/src/backend/taler-merchant-httpd_get-private-units.c @@ -18,7 +18,7 @@ * @brief implement GET /private/units * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-units.h" #include "merchant-database/lookup_units.h" diff --git a/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.c b/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.c @@ -18,7 +18,7 @@ * @brief implement GET /webhooks/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/lookup_webhook.h" diff --git a/src/backend/taler-merchant-httpd_get-private-webhooks.c b/src/backend/taler-merchant-httpd_get-private-webhooks.c @@ -18,7 +18,7 @@ * @brief implement GET /webhooks * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-private-webhooks.h" #include "merchant-database/lookup_webhooks.h" diff --git a/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.c b/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.c @@ -18,7 +18,7 @@ * @brief implement GET /products/$HASH/image * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-products-IMAGE_HASH-image.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_error_codes.h> diff --git a/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.c b/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.c @@ -18,7 +18,7 @@ * @brief implement GET /session/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-sessions-SESSION_ID.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.c @@ -18,7 +18,7 @@ * @brief implement GET /templates/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_get-templates-TEMPLATE_ID.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_get-webui.c b/src/backend/taler-merchant-httpd_get-webui.c @@ -18,7 +18,7 @@ * @brief logic to load the single page app (/) * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <taler/taler_util.h> #include <taler/taler_mhd_lib.h> diff --git a/src/backend/taler-merchant-httpd_helper.c b/src/backend/taler-merchant-httpd_helper.c @@ -18,7 +18,7 @@ * @brief shared logic for various handlers * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_db_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_mfa.c b/src/backend/taler-merchant-httpd_mfa.c @@ -22,7 +22,7 @@ * @brief internal APIs for multi-factor authentication (MFA) * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd.h" #include "taler-merchant-httpd_mfa.h" #include "merchant-database/create_mfa_challenge.h" diff --git a/src/backend/taler-merchant-httpd_mhd.c b/src/backend/taler-merchant-httpd_mhd.c @@ -22,7 +22,7 @@ * @author Benedikt Mueller * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include "taler-merchant-httpd_mhd.h" diff --git a/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /instances/$ID request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-management-instances-INSTANCE.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_patch-private-accounts-H_WIRE.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /accounts/$ID request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-accounts-H_WIRE.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-categories-CATEGORY_ID.c b/src/backend/taler-merchant-httpd_patch-private-categories-CATEGORY_ID.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /categories/$ID request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-categories-CATEGORY_ID.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-groups-GROUP_ID.c b/src/backend/taler-merchant-httpd_patch-private-groups-GROUP_ID.c @@ -20,7 +20,7 @@ * @brief implementation of PATCH /private/groups/$GROUP_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-groups-GROUP_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/update_product_group.h" diff --git a/src/backend/taler-merchant-httpd_patch-private-orders-ORDER_ID-forget.c b/src/backend/taler-merchant-httpd_patch-private-orders-ORDER_ID-forget.c @@ -21,7 +21,7 @@ * @brief implementing PATCH /orders/$ORDER_ID/forget request handling * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-orders-ORDER_ID-forget.h" #include <taler/taler_json_lib.h> #include "merchant-database/lookup_contract_terms.h" diff --git a/src/backend/taler-merchant-httpd_patch-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_patch-private-otp-devices-DEVICE_ID.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /otp-devices/$ID request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-otp-devices-DEVICE_ID.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-pots-POT_ID.c b/src/backend/taler-merchant-httpd_patch-private-pots-POT_ID.c @@ -20,7 +20,7 @@ * @brief implementation of PATCH /private/pots/$POT_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-pots-POT_ID.h" #include <taler/taler_json_lib.h> #include "merchant-database/update_money_pot.h" diff --git a/src/backend/taler-merchant-httpd_patch-private-products-PRODUCT_ID.c b/src/backend/taler-merchant-httpd_patch-private-products-PRODUCT_ID.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /products/$ID request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-products-PRODUCT_ID.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_patch-private-reports-REPORT_ID.c @@ -20,7 +20,7 @@ * @brief implementation of PATCH /private/reports/$REPORT_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-reports-REPORT_ID.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_patch-private-templates-TEMPLATE_ID.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /templates/$ID request handling * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-templates-TEMPLATE_ID.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/backend/taler-merchant-httpd_patch-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /tokenfamilies/$SLUG request handling * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-tokenfamilies-TOKEN_FAMILY_SLUG.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-units-UNIT.c b/src/backend/taler-merchant-httpd_patch-private-units-UNIT.c @@ -18,7 +18,7 @@ * @brief implement PATCH /private/units/$UNIT * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-units-UNIT.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_patch-private-webhooks-WEBHOOK_ID.c b/src/backend/taler-merchant-httpd_patch-private-webhooks-WEBHOOK_ID.c @@ -22,7 +22,7 @@ * @brief implementing PATCH /webhooks/$ID request handling * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_patch-private-webhooks-WEBHOOK_ID.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.c b/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.c @@ -22,7 +22,7 @@ * @brief endpoint to solve MFA challenge * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd.h" #include "taler-merchant-httpd_mfa.h" #include "taler-merchant-httpd_post-challenge-ID-confirm.h" diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID.c b/src/backend/taler-merchant-httpd_post-challenge-ID.c @@ -22,7 +22,7 @@ * @brief endpoint to trigger sending MFA challenge * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd.h" #include "taler-merchant-httpd_mfa.h" #include "taler-merchant-httpd_post-challenge-ID.h" diff --git a/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c b/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c @@ -23,7 +23,7 @@ * @author Christian Grothoff * @author Florian Dold */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-management-instances-INSTANCE-auth.h" #include "taler-merchant-httpd_auth.h" #include "taler-merchant-httpd_helper.h" diff --git a/src/backend/taler-merchant-httpd_post-management-instances.c b/src/backend/taler-merchant-httpd_post-management-instances.c @@ -22,7 +22,7 @@ * @brief implementing POST /instances request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-management-instances.h" #include "taler-merchant-httpd_helper.h" #include "taler-merchant-httpd.h" diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.c @@ -23,7 +23,7 @@ * @author Christian Grothoff * @author Florian Dold */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_json_lib.h> #include <taler/taler_exchange_service.h> #include "taler-merchant-httpd_exchanges.h" diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-claim.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-claim.c @@ -23,7 +23,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_signatures.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.c @@ -22,7 +22,7 @@ * @brief handling of POST /orders/$ID/paid requests * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_dbevents.h> #include <taler/taler_signatures.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.c @@ -24,7 +24,7 @@ * @author Christian Grothoff * @author Florian Dold */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_db_lib.h> #include <gnunet/gnunet_json_lib.h> @@ -46,7 +46,7 @@ #include "taler-merchant-httpd_post-orders-ORDER_ID-pay.h" #include "taler-merchant-httpd_get-private-orders.h" #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include <donau/donau_service.h> #include <donau/donau_util.h> #include <donau/donau_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-refund.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-refund.c @@ -22,7 +22,7 @@ * @brief handling of POST /orders/$ID/refund requests * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_dbevents.h> #include <taler/taler_signatures.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-unclaim.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-unclaim.c @@ -22,7 +22,7 @@ * @brief headers for POST /orders/$ID/unclaim handler * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_signatures.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.c b/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.c @@ -18,7 +18,7 @@ * @brief Handle POST /private/accounts/$H_WIRE/kycauth requests * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <microhttpd.h> #include <gnunet/gnunet_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-accounts.c b/src/backend/taler-merchant-httpd_post-private-accounts.c @@ -22,7 +22,7 @@ * @brief implementing POST /private/accounts request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-accounts.h" #include "taler-merchant-httpd_helper.h" #include "taler/taler_merchant_bank_lib.h" diff --git a/src/backend/taler-merchant-httpd_post-private-categories.c b/src/backend/taler-merchant-httpd_post-private-categories.c @@ -21,7 +21,7 @@ * @brief implementing POST /private/categories request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-categories.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-donau.c b/src/backend/taler-merchant-httpd_post-private-donau.c @@ -20,7 +20,7 @@ * @author Vlada Svirsh * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include "donau/donau_service.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-groups.c b/src/backend/taler-merchant-httpd_post-private-groups.c @@ -20,7 +20,7 @@ * @brief implementation of POST /private/groups * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-groups.h" #include <taler/taler_json_lib.h> #include "merchant-database/insert_product_group.h" diff --git a/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.c b/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.c @@ -19,7 +19,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_dbevents.h> #include <taler/taler_signatures.h> diff --git a/src/backend/taler-merchant-httpd_post-private-orders.c b/src/backend/taler-merchant-httpd_post-private-orders.c @@ -24,7 +24,7 @@ * @author Marcello Stanisci * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_db_lib.h> #include <gnunet/gnunet_json_lib.h> @@ -46,7 +46,7 @@ #include "taler-merchant-httpd_contract.h" #include "taler-merchant-httpd_helper.h" #include "taler-merchant-httpd_get-private-orders.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/start.h" #include "merchant-database/event_listen.h" #include "merchant-database/event_notify.h" diff --git a/src/backend/taler-merchant-httpd_post-private-otp-devices.c b/src/backend/taler-merchant-httpd_post-private-otp-devices.c @@ -22,7 +22,7 @@ * @brief implementing POST /otp-devices request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-otp-devices.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-pots.c b/src/backend/taler-merchant-httpd_post-private-pots.c @@ -20,7 +20,7 @@ * @brief implementation of POST /private/pots * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-pots.h" #include <taler/taler_json_lib.h> #include "merchant-database/insert_money_pot.h" diff --git a/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.c b/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.c @@ -22,7 +22,7 @@ * @brief implementing POST /products/$ID/lock request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-products.c b/src/backend/taler-merchant-httpd_post-private-products.c @@ -22,7 +22,7 @@ * @brief implementing POST /products request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-products.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-reports.c b/src/backend/taler-merchant-httpd_post-private-reports.c @@ -20,7 +20,7 @@ * @brief implementation of POST /private/reports * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-reports.h" #include <taler/taler_json_lib.h> #include <taler/taler_dbevents.h> diff --git a/src/backend/taler-merchant-httpd_post-private-templates.c b/src/backend/taler-merchant-httpd_post-private-templates.c @@ -22,7 +22,7 @@ * @brief implementing POST /templates request handling * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-templates.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-token.c b/src/backend/taler-merchant-httpd_post-private-token.c @@ -22,7 +22,7 @@ * @brief implementing POST /instances/$ID/token request handling * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-token.h" #include "taler-merchant-httpd_auth.h" #include "taler-merchant-httpd_helper.h" diff --git a/src/backend/taler-merchant-httpd_post-private-tokenfamilies.c b/src/backend/taler-merchant-httpd_post-private-tokenfamilies.c @@ -22,7 +22,7 @@ * @brief implementing POST /tokenfamilies request handling * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-tokenfamilies.h" #include "taler-merchant-httpd_helper.h" #include <gnunet/gnunet_time_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-transfers.c b/src/backend/taler-merchant-httpd_post-private-transfers.c @@ -19,7 +19,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_signatures.h> #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-units.c b/src/backend/taler-merchant-httpd_post-private-units.c @@ -18,7 +18,7 @@ * @brief implement POST /private/units * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-units.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-private-webhooks.c b/src/backend/taler-merchant-httpd_post-private-webhooks.c @@ -22,7 +22,7 @@ * @brief implementing POST /webhooks request handling * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_post-private-webhooks.h" #include "taler-merchant-httpd_helper.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.c @@ -20,7 +20,7 @@ * @brief implementation of POST /reports/$REPORT_ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_dispatcher.h" #include "taler-merchant-httpd_post-reports-REPORT_ID.h" #include <taler/taler_json_lib.h> diff --git a/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.c @@ -23,7 +23,7 @@ * @author Priscilla HUANG * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler-merchant-httpd_exchanges.h" #include "taler-merchant-httpd_post-templates-TEMPLATE_ID.h" #include "taler-merchant-httpd_post-private-orders.h" diff --git a/src/backend/taler-merchant-httpd_qr.c b/src/backend/taler-merchant-httpd_qr.c @@ -18,7 +18,7 @@ * @brief logic to create QR codes in HTML * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <qrencode.h> #include <taler-merchant-httpd_qr.h> diff --git a/src/backend/taler-merchant-httpd_statics.c b/src/backend/taler-merchant-httpd_statics.c @@ -18,7 +18,7 @@ * @brief logic to load and return static resource files by client language preference * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include "taler/taler_merchant_util.h" #include <taler/taler_util.h> diff --git a/src/backend/taler-merchant-kyccheck.c b/src/backend/taler-merchant-kyccheck.c @@ -18,7 +18,7 @@ * @brief Process that check the KYC status of our bank accounts at all exchanges * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <gnunet/gnunet_util_lib.h> #include <jansson.h> @@ -29,8 +29,8 @@ #include <taler/taler_exchange_service.h> #include "taler/taler_merchant_util.h" #include "taler/taler_merchant_bank_lib.h" -#include "taler/taler_merchantdb_lib.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/account_kyc_get_outdated.h" #include "merchant-database/account_kyc_set_status.h" #include "merchant-database/get_kyc_status.h" diff --git a/src/backend/taler-merchant-reconciliation.c b/src/backend/taler-merchant-reconciliation.c @@ -18,7 +18,7 @@ * @brief Process that reconciles information about incoming bank transfers with orders by asking the exchange * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <gnunet/gnunet_util_lib.h> #include <jansson.h> @@ -26,8 +26,8 @@ #include <taler/taler_dbevents.h> #include "taler/taler_merchant_util.h" #include "taler/taler_merchant_bank_lib.h" -#include "taler/taler_merchantdb_lib.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/finalize_transfer_status.h" #include "merchant-database/insert_transfer_details.h" #include "merchant-database/lookup_deposits_by_contract_and_coin.h" diff --git a/src/backend/taler-merchant-report-generator.c b/src/backend/taler-merchant-report-generator.c @@ -19,7 +19,7 @@ * @brief Service for fetching and transmitting merchant reports * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_db_lib.h> #include <gnunet/gnunet_curl_lib.h> @@ -27,8 +27,8 @@ #include <taler/taler_curl_lib.h> #include <taler/taler_dbevents.h> #include <taler/taler_error_codes.h> -#include "taler/taler_merchantdb_lib.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" +#include "merchantdb_lib.h" #include "taler/taler_merchant_service.h" #include <microhttpd.h> #include <curl/curl.h> diff --git a/src/backend/taler-merchant-webhook.c b/src/backend/taler-merchant-webhook.c @@ -18,14 +18,14 @@ * @brief Process that runs webhooks triggered by the merchant backend * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <gnunet/gnunet_util_lib.h> #include <jansson.h> #include <pthread.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" +#include "merchantdb_lib.h" #include <taler/taler_dbevents.h> #include "merchant-database/delete_pending_webhook.h" #include "merchant-database/lookup_pending_webhooks.h" diff --git a/src/backend/taler-merchant-wirewatch.c b/src/backend/taler-merchant-wirewatch.c @@ -18,7 +18,7 @@ * @brief Process that imports information about incoming bank transfers into the merchant backend * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <gnunet/gnunet_util_lib.h> #include <jansson.h> @@ -26,8 +26,8 @@ #include <taler/taler_dbevents.h> #include "taler/taler_merchant_util.h" #include "taler/taler_merchant_bank_lib.h" -#include "taler/taler_merchantdb_lib.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/insert_transfer.h" #include "merchant-database/select_wirewatch_accounts.h" #include "merchant-database/update_wirewatch_progress.h" diff --git a/src/backenddb/account_kyc_get_outdated.c b/src/backenddb/account_kyc_get_outdated.c @@ -18,7 +18,7 @@ * @brief Implementation of the account_kyc_get_outdated function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/account_kyc_get_status.c b/src/backenddb/account_kyc_get_status.c @@ -18,7 +18,7 @@ * @brief Implementation of the account_kyc_get_status function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/account_kyc_set_failed.c b/src/backenddb/account_kyc_set_failed.c @@ -18,7 +18,7 @@ * @brief Implementation of the account_kyc_set_failed function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/account_kyc_set_status.c b/src/backenddb/account_kyc_set_status.c @@ -19,7 +19,7 @@ * @author Iván Ávalos * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/activate_account.c b/src/backenddb/activate_account.c @@ -18,7 +18,7 @@ * @brief Implementation of the activate_account function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/check_donau_instance.c b/src/backenddb/check_donau_instance.c @@ -18,7 +18,7 @@ * @brief Implementation of the check_donau_instance function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/check_money_pots.c b/src/backenddb/check_money_pots.c @@ -18,7 +18,7 @@ * @brief Implementation of the check_money_pots function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/check_report.c b/src/backenddb/check_report.c @@ -18,7 +18,7 @@ * @brief Implementation of the check_report function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/check_transfer_exists.c b/src/backenddb/check_transfer_exists.c @@ -18,7 +18,7 @@ * @brief Implementation of the check_transfer_exists function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/create_mfa_challenge.c b/src/backenddb/create_mfa_challenge.c @@ -18,12 +18,12 @@ * @brief Implementation of the create_mfa_challenge function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/create_mfa_challenge.h" #include "helper.h" diff --git a/src/backenddb/create_tables.c b/src/backenddb/create_tables.c @@ -19,7 +19,7 @@ * @author Christian Grothoff */ #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/create_tables.h" diff --git a/src/backenddb/delete_category.c b/src/backenddb/delete_category.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_category function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_contract_terms.c b/src/backenddb/delete_contract_terms.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_contract_terms function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_donau_instance.c b/src/backenddb/delete_donau_instance.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_exchange_accounts.c b/src/backenddb/delete_exchange_accounts.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_exchange_accounts function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_instance_private_key.c b/src/backenddb/delete_instance_private_key.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_instance_private_key function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_login_token.c b/src/backenddb/delete_login_token.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_login_token function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_money_pot.c b/src/backenddb/delete_money_pot.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_money_pot function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_order.c b/src/backenddb/delete_order.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_order function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_otp.c b/src/backenddb/delete_otp.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_otp function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_pending_webhook.c b/src/backenddb/delete_pending_webhook.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_pending_webhook function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_product.c b/src/backenddb/delete_product.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_product function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_product_group.c b/src/backenddb/delete_product_group.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_product_group function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_report.c b/src/backenddb/delete_report.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_report function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_template.c b/src/backenddb/delete_template.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_template function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_token_family.c b/src/backenddb/delete_token_family.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_token_family function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_transfer.c b/src/backenddb/delete_transfer.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_transfer function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_unit.c b/src/backenddb/delete_unit.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_unit function for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/delete_webhook.c b/src/backenddb/delete_webhook.c @@ -18,7 +18,7 @@ * @brief Implementation of the delete_webhook function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/drop_tables.c b/src/backenddb/drop_tables.c @@ -19,7 +19,7 @@ * @author Christian Grothoff */ #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/drop_tables.h" enum GNUNET_GenericReturnValue diff --git a/src/backenddb/event_listen.c b/src/backenddb/event_listen.c @@ -19,7 +19,7 @@ * @author Christian Grothoff */ #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/event_listen.h" #include "helper.h" diff --git a/src/backenddb/event_notify.c b/src/backenddb/event_notify.c @@ -19,7 +19,7 @@ * @author Christian Grothoff */ #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/event_notify.h" #include "helper.h" diff --git a/src/backenddb/expire_locks.c b/src/backenddb/expire_locks.c @@ -18,7 +18,7 @@ * @brief Implementation of the expire_locks function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/finalize_transfer_status.c b/src/backenddb/finalize_transfer_status.c @@ -18,7 +18,7 @@ * @brief Implementation of the finalize_transfer_status function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/gc.c b/src/backenddb/gc.c @@ -18,7 +18,7 @@ * @brief Implementation of the gc function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/get_kyc_limits.c b/src/backenddb/get_kyc_limits.c @@ -18,7 +18,7 @@ * @brief Implementation of the get_kyc_limits function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/get_kyc_status.c b/src/backenddb/get_kyc_status.c @@ -18,7 +18,7 @@ * @brief Implementation of the get_kyc_status function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/inactivate_account.c b/src/backenddb/inactivate_account.c @@ -18,7 +18,7 @@ * @brief Implementation of the inactivate_account function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/increase_refund.c b/src/backenddb/increase_refund.c @@ -18,7 +18,7 @@ * @brief Implementation of the increase_refund function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/increment_money_pots.c b/src/backenddb/increment_money_pots.c @@ -18,7 +18,7 @@ * @brief Implementation of the increment_money_pots function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_account.c b/src/backenddb/insert_account.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_account function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_category.c b/src/backenddb/insert_category.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_category function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_contract_terms.c b/src/backenddb/insert_contract_terms.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_contract_terms function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_deposit.c b/src/backenddb/insert_deposit.c @@ -19,7 +19,7 @@ * @author Christian Grothoff * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_deposit_confirmation.c b/src/backenddb/insert_deposit_confirmation.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_deposit_confirmation function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_deposit_to_transfer.c b/src/backenddb/insert_deposit_to_transfer.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_deposit_to_transfer function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_donau_instance.c b/src/backenddb/insert_donau_instance.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_exchange_account.c b/src/backenddb/insert_exchange_account.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_exchange_account function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_exchange_keys.c b/src/backenddb/insert_exchange_keys.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_exchange_keys function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_exchange_signkey.c b/src/backenddb/insert_exchange_signkey.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_exchange_signkey function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_instance.c b/src/backenddb/insert_instance.c @@ -19,7 +19,7 @@ * @author Christian Grothoff * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_issued_token.c b/src/backenddb/insert_issued_token.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_issued_token function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_login_token.c b/src/backenddb/insert_login_token.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_login_token function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_money_pot.c b/src/backenddb/insert_money_pot.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_money_pot function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_order.c b/src/backenddb/insert_order.c @@ -19,7 +19,7 @@ * @author Iván Ávalos * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_order_blinded_sigs.c b/src/backenddb/insert_order_blinded_sigs.c @@ -18,7 +18,7 @@ * @brief implementation of insert_order_blinded_sigs() for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_pq_lib.h> #include "merchant-database/insert_order_blinded_sigs.h" diff --git a/src/backenddb/insert_order_lock.c b/src/backenddb/insert_order_lock.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_order_lock function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_otp.c b/src/backenddb/insert_otp.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_otp function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_pending_webhook.c b/src/backenddb/insert_pending_webhook.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_pending_webhook function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_product.c b/src/backenddb/insert_product.c @@ -19,7 +19,7 @@ * @author Christian Grothoff * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_product_group.c b/src/backenddb/insert_product_group.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_product_group function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_refund_proof.c b/src/backenddb/insert_refund_proof.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_refund_proof function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_report.c b/src/backenddb/insert_report.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_report function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_spent_token.c b/src/backenddb/insert_spent_token.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_spent_token function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_template.c b/src/backenddb/insert_template.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_template function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_token_family.c b/src/backenddb/insert_token_family.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_token_family function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_token_family_key.c b/src/backenddb/insert_token_family_key.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_token_family_key function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_pq_lib.h> #include <taler/taler_error_codes.h> diff --git a/src/backenddb/insert_transfer.c b/src/backenddb/insert_transfer.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_transfer function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_transfer_details.c b/src/backenddb/insert_transfer_details.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_transfer_details function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_unclaim_signature.c b/src/backenddb/insert_unclaim_signature.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_unclaim_signature function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_unit.c b/src/backenddb/insert_unit.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_unit function for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/insert_webhook.c b/src/backenddb/insert_webhook.c @@ -18,7 +18,7 @@ * @brief Implementation of the insert_webhook function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lock_product.c b/src/backenddb/lock_product.c @@ -18,7 +18,7 @@ * @brief Implementation of the lock_product function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_account.c b/src/backenddb/lookup_account.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_account function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_all_products.c b/src/backenddb/lookup_all_products.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_all_products function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_categories.c b/src/backenddb/lookup_categories.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_categories function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_categories_by_ids.c b/src/backenddb/lookup_categories_by_ids.c @@ -18,7 +18,7 @@ * @brief Lookup product categories by ID * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_contract_terms.c b/src/backenddb/lookup_contract_terms.c @@ -19,7 +19,7 @@ * @author Iván Ávalos * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_contract_terms2.c b/src/backenddb/lookup_contract_terms2.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_contract_terms2 function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_contract_terms3.c b/src/backenddb/lookup_contract_terms3.c @@ -19,7 +19,7 @@ * @author Iván Ávalos * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <sys/types.h> #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> diff --git a/src/backenddb/lookup_custom_units_by_names.c b/src/backenddb/lookup_custom_units_by_names.c @@ -18,7 +18,7 @@ * @brief Lookup custom measurement units by name * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_deposits.c b/src/backenddb/lookup_deposits.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_deposits function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_deposits_by_contract_and_coin.c b/src/backenddb/lookup_deposits_by_contract_and_coin.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_deposits_by_contract_and_coin function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_deposits_by_order.c b/src/backenddb/lookup_deposits_by_order.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_deposits_by_order function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_donau_keys.c b/src/backenddb/lookup_donau_keys.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_expected_transfer.c b/src/backenddb/lookup_expected_transfer.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_expected_transfer function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_expected_transfers.c b/src/backenddb/lookup_expected_transfers.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_expected_transfers function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_instance_auth.c b/src/backenddb/lookup_instance_auth.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_instance_auth function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_instances.c b/src/backenddb/lookup_instances.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_instances function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_pq_lib.h> #include "merchant-database/lookup_instances.h" diff --git a/src/backenddb/lookup_inventory_products.c b/src/backenddb/lookup_inventory_products.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_inventory_products function for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_inventory_products_filtered.c b/src/backenddb/lookup_inventory_products_filtered.c @@ -18,7 +18,7 @@ * @brief Lookup inventory product details for templates (filtered) * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_login_tokens.c b/src/backenddb/lookup_login_tokens.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_login_tokens function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_mfa_challenge.c b/src/backenddb/lookup_mfa_challenge.c @@ -18,12 +18,12 @@ * @brief Implementation of the lookup_mfa_challenge function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/lookup_mfa_challenge.h" #include "helper.h" diff --git a/src/backenddb/lookup_order.c b/src/backenddb/lookup_order.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_order function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_order_by_fulfillment.c b/src/backenddb/lookup_order_by_fulfillment.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_order_by_fulfillment function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_order_charity.c b/src/backenddb/lookup_order_charity.c @@ -24,11 +24,11 @@ * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "donau/donau_service.h" #include "merchant-database/lookup_order_charity.h" #include "helper.h" diff --git a/src/backenddb/lookup_order_status.c b/src/backenddb/lookup_order_status.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_order_status function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_order_status_by_serial.c b/src/backenddb/lookup_order_status_by_serial.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_order_status_by_serial function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_order_summary.c b/src/backenddb/lookup_order_summary.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_order_summary function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_orders.c b/src/backenddb/lookup_orders.c @@ -19,7 +19,7 @@ * @author Iván Ávalos * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_otp_devices.c b/src/backenddb/lookup_otp_devices.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_otp_devices function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_pending_deposits.c b/src/backenddb/lookup_pending_deposits.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_pending_deposits function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_pending_webhooks.c b/src/backenddb/lookup_pending_webhooks.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_pending_webhooks function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_product.c b/src/backenddb/lookup_product.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_product function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_product_image.c b/src/backenddb/lookup_product_image.c @@ -20,7 +20,7 @@ */ #include <taler/taler_error_codes.h> #include <taler/taler_pq_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/lookup_product_image.h" #include "helper.h" diff --git a/src/backenddb/lookup_products.c b/src/backenddb/lookup_products.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_products function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_reconciliation_details.c b/src/backenddb/lookup_reconciliation_details.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_reconciliation_details function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_refund_proof.c b/src/backenddb/lookup_refund_proof.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_refund_proof function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_refunds.c b/src/backenddb/lookup_refunds.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_refunds function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_refunds_detailed.c b/src/backenddb/lookup_refunds_detailed.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_refunds_detailed function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_reports_pending.c b/src/backenddb/lookup_reports_pending.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_reports_pending function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_spent_tokens_by_order.c b/src/backenddb/lookup_spent_tokens_by_order.c @@ -18,13 +18,13 @@ * @brief Implementation of the lookup_spent_tokens_by_order function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "merchant-database/lookup_spent_tokens_by_order.h" #include "helper.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** * Closure for lookup_spent_tokens_by_order_cb(). diff --git a/src/backenddb/lookup_statistics_amount_by_bucket.c b/src/backenddb/lookup_statistics_amount_by_bucket.c @@ -18,13 +18,13 @@ * @brief Implementation of the lookup_statistics_amount_by_bucket function for Postgres * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "merchant-database/lookup_statistics_amount_by_bucket.h" #include "helper.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/backenddb/lookup_statistics_amount_by_bucket2.c b/src/backenddb/lookup_statistics_amount_by_bucket2.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_statistics_amount_by_bucket2 function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_statistics_amount_by_interval.c b/src/backenddb/lookup_statistics_amount_by_interval.c @@ -18,13 +18,13 @@ * @brief Implementation of the lookup_statistics_amount_by_interval function for Postgres * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "merchant-database/lookup_statistics_amount_by_interval.h" #include "helper.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/backenddb/lookup_statistics_counter_by_bucket.c b/src/backenddb/lookup_statistics_counter_by_bucket.c @@ -18,13 +18,13 @@ * @brief Implementation of the lookup_statistics_counter_by_bucket function for Postgres * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "merchant-database/lookup_statistics_counter_by_bucket.h" #include "helper.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/backenddb/lookup_statistics_counter_by_bucket2.c b/src/backenddb/lookup_statistics_counter_by_bucket2.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_statistics_counter_by_bucket2 function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_statistics_counter_by_interval.c b/src/backenddb/lookup_statistics_counter_by_interval.c @@ -18,13 +18,13 @@ * @brief Implementation of the lookup_statistics_counter_by_interval function for Postgres * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "merchant-database/lookup_statistics_counter_by_interval.h" #include "helper.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/backenddb/lookup_template.c b/src/backenddb/lookup_template.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_template function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_templates.c b/src/backenddb/lookup_templates.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_templates function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_token_families.c b/src/backenddb/lookup_token_families.c @@ -18,13 +18,13 @@ * @brief Implementation of the lookup_token_families function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "merchant-database/lookup_token_families.h" #include "helper.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/backenddb/lookup_token_family.c b/src/backenddb/lookup_token_family.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_token_family function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_token_family_key.c b/src/backenddb/lookup_token_family_key.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_token_family_key function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_pq_lib.h> #include <gnunet/gnunet_time_lib.h> #include <string.h> diff --git a/src/backenddb/lookup_token_family_keys.c b/src/backenddb/lookup_token_family_keys.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_token_family_keys function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_transfer_details.c b/src/backenddb/lookup_transfer_details.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_transfer_details function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_transfer_details_by_order.c b/src/backenddb/lookup_transfer_details_by_order.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_transfer_details_by_order function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_transfer_summary.c b/src/backenddb/lookup_transfer_summary.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_transfer_summary function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_transfers.c b/src/backenddb/lookup_transfers.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_transfers function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_units.c b/src/backenddb/lookup_units.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_units function for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_webhook.c b/src/backenddb/lookup_webhook.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_webhook function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_webhook_by_event.c b/src/backenddb/lookup_webhook_by_event.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_webhook_by_event function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_webhooks.c b/src/backenddb/lookup_webhooks.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_webhooks function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/lookup_wire_fee.c b/src/backenddb/lookup_wire_fee.c @@ -18,7 +18,7 @@ * @brief Implementation of the lookup_wire_fee function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/mark_contract_paid.c b/src/backenddb/mark_contract_paid.c @@ -18,7 +18,7 @@ * @brief Implementation of the mark_contract_paid function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/mark_order_wired.c b/src/backenddb/mark_order_wired.c @@ -18,7 +18,7 @@ * @brief Implementation of the mark_order_wired function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/merchantdb_helper.c b/src/backenddb/merchantdb_helper.c @@ -19,9 +19,9 @@ * @author Christian Grothoff * @author Priscilla Huang */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_util.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" void diff --git a/src/backenddb/pg.c b/src/backenddb/pg.c @@ -22,14 +22,14 @@ * @author Priscilla Huang * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_pq_lib.h> #include <taler/taler_util.h> #include <taler/taler_pq_lib.h> #include <taler/taler_json_lib.h> #include <taler/taler_mhd_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "helper.h" diff --git a/src/backenddb/preflight.c b/src/backenddb/preflight.c @@ -19,7 +19,7 @@ * @author Christian Grothoff */ #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/preflight.h" #include "helper.h" diff --git a/src/backenddb/purge_instance.c b/src/backenddb/purge_instance.c @@ -18,7 +18,7 @@ * @brief Implementation of the purge_instance function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/refund_coin.c b/src/backenddb/refund_coin.c @@ -18,7 +18,7 @@ * @brief Implementation of the refund_coin function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_account.c b/src/backenddb/select_account.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_account function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_account_by_uri.c b/src/backenddb/select_account_by_uri.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_account_by_uri function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_accounts.c b/src/backenddb/select_accounts.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_accounts function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_accounts_by_exchange.c b/src/backenddb/select_accounts_by_exchange.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_accounts_by_exchange function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_all_donau_instances.c b/src/backenddb/select_all_donau_instances.c @@ -20,7 +20,7 @@ * @author Vlada Svirsh * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_category.c b/src/backenddb/select_category.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_category function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_category_by_name.c b/src/backenddb/select_category_by_name.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_category_by_name function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_donau_instance_by_serial.c b/src/backenddb/select_donau_instance_by_serial.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_donau_instances.c b/src/backenddb/select_donau_instances.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_donau_instances_filtered.c b/src/backenddb/select_donau_instances_filtered.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_exchange_keys.c b/src/backenddb/select_exchange_keys.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_exchange_keys function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_exchanges.c b/src/backenddb/select_exchanges.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_exchanges function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_login_token.c b/src/backenddb/select_login_token.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_login_token function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_money_pot.c b/src/backenddb/select_money_pot.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_money_pot function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_money_pots.c b/src/backenddb/select_money_pots.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_money_pots function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_open_transfers.c b/src/backenddb/select_open_transfers.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_open_transfers function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_order_blinded_sigs.c b/src/backenddb/select_order_blinded_sigs.c @@ -18,7 +18,7 @@ * @brief Implementation of the select blinded sigs by order_id function for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_otp.c b/src/backenddb/select_otp.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_otp function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_otp_serial.c b/src/backenddb/select_otp_serial.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_otp_serial function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_product_groups.c b/src/backenddb/select_product_groups.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_product_groups function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_report.c b/src/backenddb/select_report.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_report function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_reports.c b/src/backenddb/select_reports.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_reports function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_unit.c b/src/backenddb/select_unit.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_unit function for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/select_wirewatch_accounts.c b/src/backenddb/select_wirewatch_accounts.c @@ -18,7 +18,7 @@ * @brief Implementation of the select_wirewatch_accounts function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/solve_mfa_challenge.c b/src/backenddb/solve_mfa_challenge.c @@ -18,7 +18,7 @@ * @brief Implementation of the solve_mfa_challenge function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/start.c b/src/backenddb/start.c @@ -19,7 +19,7 @@ * @author Christian Grothoff */ #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/start.h" #include "merchant-database/preflight.h" #include "helper.h" diff --git a/src/backenddb/store_wire_fee_by_exchange.c b/src/backenddb/store_wire_fee_by_exchange.c @@ -18,7 +18,7 @@ * @brief Implementation of the store_wire_fee_by_exchange function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c @@ -20,13 +20,13 @@ * @author Christian Grothoff * @author Pricilla Huang */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <taler/taler_util.h> #include <taler/taler_json_lib.h> #include <taler/taler_signatures.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/account_kyc_get_status.h" #include "merchant-database/account_kyc_set_status.h" #include "merchant-database/delete_contract_terms.h" diff --git a/src/backenddb/unlock_inventory.c b/src/backenddb/unlock_inventory.c @@ -18,7 +18,7 @@ * @brief Implementation of the unlock_inventory function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_account.c b/src/backenddb/update_account.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_account function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_category.c b/src/backenddb/update_category.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_category function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_contract_session.c b/src/backenddb/update_contract_session.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_contract_session function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_contract_terms.c b/src/backenddb/update_contract_terms.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_contract_terms function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_deposit_confirmation_status.c b/src/backenddb/update_deposit_confirmation_status.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_deposit_confirmation_status function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_donau_instance.c b/src/backenddb/update_donau_instance.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_donau_instance_receipts_amount.c b/src/backenddb/update_donau_instance_receipts_amount.c @@ -20,7 +20,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_instance.c b/src/backenddb/update_instance.c @@ -19,7 +19,7 @@ * @author Christian Grothoff * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_instance_auth.c b/src/backenddb/update_instance_auth.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_instance_auth function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_mfa_challenge.c b/src/backenddb/update_mfa_challenge.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_mfa_challenge function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_money_pot.c b/src/backenddb/update_money_pot.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_money_pot function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_otp.c b/src/backenddb/update_otp.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_otp function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_pending_webhook.c b/src/backenddb/update_pending_webhook.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_pending_webhook function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_product.c b/src/backenddb/update_product.c @@ -19,7 +19,7 @@ * @author Christian Grothoff * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_product_group.c b/src/backenddb/update_product_group.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_product_group function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_report.c b/src/backenddb/update_report.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_report function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_report_status.c b/src/backenddb/update_report_status.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_report_status function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_template.c b/src/backenddb/update_template.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_template function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_token_family.c b/src/backenddb/update_token_family.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_token_family function for Postgres * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_transfer_status.c b/src/backenddb/update_transfer_status.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_transfer_status function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_unit.c b/src/backenddb/update_unit.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_unit function for Postgres * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_webhook.c b/src/backenddb/update_webhook.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_webhook function for Postgres * @author Iván Ávalos */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/update_wirewatch_progress.c b/src/backenddb/update_wirewatch_progress.c @@ -18,7 +18,7 @@ * @brief Implementation of the update_wirewatch_progress function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/backenddb/upsert_donau_keys.c b/src/backenddb/upsert_donau_keys.c @@ -19,7 +19,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> diff --git a/src/bank/mb_common.c b/src/bank/mb_common.c @@ -19,7 +19,7 @@ * @brief Common functions for the bank API * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "mb_common.h" diff --git a/src/bank/mb_credit.c b/src/bank/mb_credit.c @@ -23,7 +23,7 @@ * @author Christian Grothoff * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include "mb_common.h" #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/bank/mb_parse.c b/src/bank/mb_parse.c @@ -19,7 +19,7 @@ * @brief Convenience function to parse authentication configuration * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_merchant_bank_lib.h" #include <gnunet/gnunet_json_lib.h> diff --git a/src/include/cutted_from_service b/src/include/cutted_from_service @@ -1,155 +0,0 @@ -///* PART FROM WHICH IDEAS FOR NEW IMPLEMENTATION HAVE BEEN DEFINED*/ -// -///* application *before* including this header should do: */ -//#define TALER_MERCHANT_ORDER_PAY_CALLBACK_CLOSURE_TYPE struct PayState -// -// -//#ifndef TALER_MERCHANT_ORDER_PAY_CALLBACK_CLOSURE_TYPE -//#define TALER_MERCHANT_ORDER_PAY_CALLBACK_CLOSURE_TYPE void -//#endif -// -//struct TALER_MERCHANT_OrderPayHandle * -//TALER_MERCHANT_order_pay_create ( -// struct GNUNET_CURL_Context *ctx, -// TALER_MERCHANT_OrderPayCallback pay_cb, -// TALER_MERCHANT_ORDER_PAY_CALLBACK_CLOSURE_TYPE *pay_cb_cls) -//{ -// ph->body = json_object (); // json_t * -//} -// -// -//struct TALER_MERCHANT_OrderPayOption -//{ -// enum TALER_MERCHANT_OrderPayOptionType -// { -// TALER_MERCHANT_OrderPayOptionType_END = 0, -// TALER_MERCHANT_OrderPayOptionType_MERCHANT_URL, -// TALER_MERCHANT_OrderPayOptionType_SESSION_ID, -// TALER_MERCHANT_OrderPayOptionType_H_CONTRACT, -// TALER_MERCHANT_OrderPayOptionType_CHOICE_INDEX, -// TALER_MERCHANT_OrderPayOptionType_AMOUNT, -// TALER_MERCHANT_OrderPayOptionType_MAX_FEE, -// TALER_MERCHANT_OrderPayOptionType_MERCHANT_PUB, -// TALER_MERCHANT_OrderPayOptionType_TIMESTAMP, -// TALER_MERCHANT_OrderPayOptionType_REFUND_DEADLINE, -// TALER_MERCHANT_OrderPayOptionType_PAY_DEADLINE, -// TALER_MERCHANT_OrderPayOptionType_H_WIRE, -// TALER_MERCHANT_OrderPayOptionType_ORDER_ID, -// TALER_MERCHANT_OrderPayOptionType_COINS, -// TALER_MERCHANT_OrderPayOptionType_INPUT_TOKENS, -// TALER_MERCHANT_OrderPayOptionType_OUTPUT_TOKENS -// } ot; -// -// union -// { -// const char *merchant_url; -// const char *session_id; -// const struct TALER_PrivateContractHashP *h_contract; -// int choice_index; -// struct TALER_Amount amount; -// struct TALER_Amount max_fee; -// struct TALER_MerchantPublicKeyP merchant_pub; -// struct GNUNET_TIME_Timestamp timestamp; -// struct GNUNET_TIME_Timestamp refund_deadline; -// struct GNUNET_TIME_Timestamp pay_deadline; -// struct TALER_MerchantWireHashP h_wire; -// const char *order_id; -// struct -// { -// unsigned int num_coins; -// const struct TALER_MERCHANT_PayCoin *coins; -// } coins; -// struct -// { -// unsigned int num_tokens; -// const struct TALER_MERCHANT_UseToken *tokens; -// } input_tokens; -// struct -// { -// unsigned int num_output_tokens, -// const struct TALER_MERCHANT_OutputToken *output_tokens; -// } output_tokens; -// } details; -//}; -// -///*FIXME: THIS PARTS NEEDS TO BE DEFINED CLEARLY and ideally in new file with previous struct*/ -//enum TALER_MERCHANT_OrderPayOptionErrorCode -//TALER_MERCHANT_order_pay_set_options ( -// struct TALER_MERCHANT_OrderPayHandle *ph, -// struct TALER_MERCHANT_OrderPayOption options[], -// size_t max_options); -// -//{ -// for (i-- not 0 - terminateor && i < max_options; i++) -// switch (options[i].type) -// case ... -// GNUNET_assert (0 == -// json_object_set_new (ph->body, -// "field", -// json_string ("foo"))); -// return OK; -// case ... -// GNUNET_assert (0 == -// json_object_set_new (ph->body, -// "field", -// json_bool (true))); -// -// return OK; -// case ... -// GNUNET_assert (0 == -// json_object_set_new (ph->body, -// "wire_hash", -// GNUNET_JSON_PACK ( -// GNUNET_JSON_pack_data_auto (NULL, -// &options[i -// ].details. -// h_wire)))) -// return OK; -//} -// -//} -//return ERROR_UNKNOWN_OPTION; -//} -// -//#define TALER_MERCHANT_ORDER_PAY_OPTION_TERMINATE() \ -// (const struct TALER_MERCHANT_OrderPayOption) { \ -// .ot = TALER_MERCHANT_OrderPayOptionType_END \ -// } -// -// -//#define TALER_MERCHANT_ORDER_PAY_OPTION_SESSION_ID(session_id) \ -// (const struct TALER_MERCHANT_OrderPayOption) { \ -// .ot = TALER_MERCHANT_OrderPayOptionType_SESSION_ID, \ -// .details.session_id = session_id \ -// } -// -//#define TALER_MERCHANT_ORDER_PAY_SET_OPTIONS(ph,...) \ -// MHD_NOWARN_COMPOUND_LITERALS_ \ -// TALER_MERCHANT_order_pay_set_options ( \ -// daemon, \ -// ((const struct TALER_MERCHANT_OrderPayHandle[]) \ -// {__VA_ARGS__, TALER_MERCHANT_ORDER_PAY_OPTION_TERMINATE ()}), \ -// MHD_OPTIONS_ARRAY_MAX_SIZE) \ -// -///* END OF THE PART THAT NEEDS TO BE EXTENDED */ -// -//enum TALER_MERCHANT_OrderPayOptionErrorCode -//TALER_MERCHANT_order_pay_start (struct TALER_MERCHANT_OrderPayHandle *ph); - -//#if APP /*SAMPLE OF USAGE OF PREVIOUS DEFINITIONS*/ -//{ -// struct TALER_MERCHANT_OrderPayHandle *ph; -// -// ph = TALER_MERCHANT_order_pay_create (struct GNUNET_CURL_Context *ctx, -// TALER_MERCHANT_OrderPayCallback pay_cb, -// pay_cb_cls); -// -// GNUNET_assert (OK == -// TALER_MERCHANT_ORDER_PAY_SET_OPTIONS ( -// ph, -// TALER_MERCHANT_ORDER_PAY_OPTION_SESSION_ID ("session"))); -// pay_start (ph); -//} -//#endif - -/* END OF LIST OF IDEAS */ -\ No newline at end of file diff --git a/src/include/merchant-database/account_kyc_get_outdated.h b/src/include/merchant-database/account_kyc_get_outdated.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/account_kyc_get_status.h b/src/include/merchant-database/account_kyc_get_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/account_kyc_set_failed.h b/src/include/merchant-database/account_kyc_set_failed.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/account_kyc_set_status.h b/src/include/merchant-database/account_kyc_set_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/activate_account.h b/src/include/merchant-database/activate_account.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/check_donau_instance.h b/src/include/merchant-database/check_donau_instance.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/check_money_pots.h b/src/include/merchant-database/check_money_pots.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/check_report.h b/src/include/merchant-database/check_report.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/check_transfer_exists.h b/src/include/merchant-database/check_transfer_exists.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/create_mfa_challenge.h b/src/include/merchant-database/create_mfa_challenge.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/create_tables.h b/src/include/merchant-database/create_tables.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** * Initialize tables. diff --git a/src/include/merchant-database/delete_category.h b/src/include/merchant-database/delete_category.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_contract_terms.h b/src/include/merchant-database/delete_contract_terms.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_donau_instance.h b/src/include/merchant-database/delete_donau_instance.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_exchange_accounts.h b/src/include/merchant-database/delete_exchange_accounts.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_instance_private_key.h b/src/include/merchant-database/delete_instance_private_key.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_login_token.h b/src/include/merchant-database/delete_login_token.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_money_pot.h b/src/include/merchant-database/delete_money_pot.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_order.h b/src/include/merchant-database/delete_order.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_otp.h b/src/include/merchant-database/delete_otp.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_pending_webhook.h b/src/include/merchant-database/delete_pending_webhook.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_product.h b/src/include/merchant-database/delete_product.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_product_group.h b/src/include/merchant-database/delete_product_group.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_report.h b/src/include/merchant-database/delete_report.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_template.h b/src/include/merchant-database/delete_template.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_token_family.h b/src/include/merchant-database/delete_token_family.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_transfer.h b/src/include/merchant-database/delete_transfer.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_unit.h b/src/include/merchant-database/delete_unit.h @@ -21,7 +21,7 @@ #ifndef MERCHANT_DATABASE_DELETE_UNIT_H #define MERCHANT_DATABASE_DELETE_UNIT_H -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/delete_webhook.h b/src/include/merchant-database/delete_webhook.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/drop_tables.h b/src/include/merchant-database/drop_tables.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/event_listen.h b/src/include/merchant-database/event_listen.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/event_notify.h b/src/include/merchant-database/event_notify.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/expire_locks.h b/src/include/merchant-database/expire_locks.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/finalize_transfer_status.h b/src/include/merchant-database/finalize_transfer_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/gc.h b/src/include/merchant-database/gc.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/get_kyc_limits.h b/src/include/merchant-database/get_kyc_limits.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/get_kyc_status.h b/src/include/merchant-database/get_kyc_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/inactivate_account.h b/src/include/merchant-database/inactivate_account.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/increase_refund.h b/src/include/merchant-database/increase_refund.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/increment_money_pots.h b/src/include/merchant-database/increment_money_pots.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_account.h b/src/include/merchant-database/insert_account.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_category.h b/src/include/merchant-database/insert_category.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_contract_terms.h b/src/include/merchant-database/insert_contract_terms.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_deposit.h b/src/include/merchant-database/insert_deposit.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_deposit_confirmation.h b/src/include/merchant-database/insert_deposit_confirmation.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_deposit_to_transfer.h b/src/include/merchant-database/insert_deposit_to_transfer.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> #include "taler/taler_exchange_service.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/insert_donau_instance.h b/src/include/merchant-database/insert_donau_instance.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "donau/donau_service.h" diff --git a/src/include/merchant-database/insert_exchange_account.h b/src/include/merchant-database/insert_exchange_account.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_exchange_keys.h b/src/include/merchant-database/insert_exchange_keys.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "taler/taler_exchange_service.h" diff --git a/src/include/merchant-database/insert_exchange_signkey.h b/src/include/merchant-database/insert_exchange_signkey.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_instance.h b/src/include/merchant-database/insert_instance.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_issued_token.h b/src/include/merchant-database/insert_issued_token.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_login_token.h b/src/include/merchant-database/insert_login_token.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_money_pot.h b/src/include/merchant-database/insert_money_pot.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_order.h b/src/include/merchant-database/insert_order.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_order_blinded_sigs.h b/src/include/merchant-database/insert_order_blinded_sigs.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_order_lock.h b/src/include/merchant-database/insert_order_lock.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_otp.h b/src/include/merchant-database/insert_otp.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_pending_webhook.h b/src/include/merchant-database/insert_pending_webhook.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_product.h b/src/include/merchant-database/insert_product.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_product_group.h b/src/include/merchant-database/insert_product_group.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_refund_proof.h b/src/include/merchant-database/insert_refund_proof.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_report.h b/src/include/merchant-database/insert_report.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_spent_token.h b/src/include/merchant-database/insert_spent_token.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_template.h b/src/include/merchant-database/insert_template.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_token_family.h b/src/include/merchant-database/insert_token_family.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_token_family_key.h b/src/include/merchant-database/insert_token_family_key.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_transfer.h b/src/include/merchant-database/insert_transfer.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_transfer_details.h b/src/include/merchant-database/insert_transfer_details.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "taler/taler_exchange_service.h" diff --git a/src/include/merchant-database/insert_unclaim_signature.h b/src/include/merchant-database/insert_unclaim_signature.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_unit.h b/src/include/merchant-database/insert_unit.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/insert_webhook.h b/src/include/merchant-database/insert_webhook.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lock_product.h b/src/include/merchant-database/lock_product.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_account.h b/src/include/merchant-database/lookup_account.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_all_products.h b/src/include/merchant-database/lookup_all_products.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_categories.h b/src/include/merchant-database/lookup_categories.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_categories_by_ids.h b/src/include/merchant-database/lookup_categories_by_ids.h @@ -21,7 +21,7 @@ #ifndef MERCHANT_DATABASE_LOOKUP_CATEGORIES_BY_IDS_H #define MERCHANT_DATABASE_LOOKUP_CATEGORIES_BY_IDS_H -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_contract_terms.h b/src/include/merchant-database/lookup_contract_terms.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_contract_terms2.h b/src/include/merchant-database/lookup_contract_terms2.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_contract_terms3.h b/src/include/merchant-database/lookup_contract_terms3.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_custom_units_by_names.h b/src/include/merchant-database/lookup_custom_units_by_names.h @@ -22,7 +22,7 @@ #define MERCHANT_DATABASE_LOOKUP_CUSTOM_UNITS_BY_NAMES_H #include <taler/taler_util.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_deposits.h b/src/include/merchant-database/lookup_deposits.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_deposits_by_contract_and_coin.h b/src/include/merchant-database/lookup_deposits_by_contract_and_coin.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_deposits_by_order.h b/src/include/merchant-database/lookup_deposits_by_order.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_donau_keys.h b/src/include/merchant-database/lookup_donau_keys.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "donau/donau_service.h" diff --git a/src/include/merchant-database/lookup_expected_transfer.h b/src/include/merchant-database/lookup_expected_transfer.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_expected_transfers.h b/src/include/merchant-database/lookup_expected_transfers.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_instance_auth.h b/src/include/merchant-database/lookup_instance_auth.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_instances.h b/src/include/merchant-database/lookup_instances.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** * Typically called by `lookup_instances`. diff --git a/src/include/merchant-database/lookup_inventory_products.h b/src/include/merchant-database/lookup_inventory_products.h @@ -21,7 +21,7 @@ #ifndef MERCHANT_DATABASE_LOOKUP_INVENTORY_PRODUCTS_H #define MERCHANT_DATABASE_LOOKUP_INVENTORY_PRODUCTS_H -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_inventory_products_filtered.h b/src/include/merchant-database/lookup_inventory_products_filtered.h @@ -21,7 +21,7 @@ #ifndef MERCHANT_DATABASE_LOOKUP_INVENTORY_PRODUCTS_FILTERED_H #define MERCHANT_DATABASE_LOOKUP_INVENTORY_PRODUCTS_FILTERED_H -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_login_tokens.h b/src/include/merchant-database/lookup_login_tokens.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_mfa_challenge.h b/src/include/merchant-database/lookup_mfa_challenge.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_order.h b/src/include/merchant-database/lookup_order.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_order_by_fulfillment.h b/src/include/merchant-database/lookup_order_by_fulfillment.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_order_charity.h b/src/include/merchant-database/lookup_order_charity.h @@ -27,12 +27,12 @@ #ifndef MERCHANT_DATABASE_LOOKUP_ORDER_CHARITY_H #define MERCHANT_DATABASE_LOOKUP_ORDER_CHARITY_H -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_error_codes.h> #include <taler/taler_dbevents.h> #include <taler/taler_pq_lib.h> #include "donau/donau_service.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_order_status.h b/src/include/merchant-database/lookup_order_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_order_status_by_serial.h b/src/include/merchant-database/lookup_order_status_by_serial.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_order_summary.h b/src/include/merchant-database/lookup_order_summary.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_orders.h b/src/include/merchant-database/lookup_orders.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_otp_devices.h b/src/include/merchant-database/lookup_otp_devices.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_pending_deposits.h b/src/include/merchant-database/lookup_pending_deposits.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_pending_webhooks.h b/src/include/merchant-database/lookup_pending_webhooks.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_product.h b/src/include/merchant-database/lookup_product.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_product_image.h b/src/include/merchant-database/lookup_product_image.h @@ -21,7 +21,7 @@ #ifndef MERCHANT_DATABASE_LOOKUP_PRODUCT_IMAGE_H #define MERCHANT_DATABASE_LOOKUP_PRODUCT_IMAGE_H -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" enum GNUNET_DB_QueryStatus diff --git a/src/include/merchant-database/lookup_products.h b/src/include/merchant-database/lookup_products.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_reconciliation_details.h b/src/include/merchant-database/lookup_reconciliation_details.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_refund_proof.h b/src/include/merchant-database/lookup_refund_proof.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_refunds.h b/src/include/merchant-database/lookup_refunds.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_refunds_detailed.h b/src/include/merchant-database/lookup_refunds_detailed.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_reports_pending.h b/src/include/merchant-database/lookup_reports_pending.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_spent_tokens_by_order.h b/src/include/merchant-database/lookup_spent_tokens_by_order.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_statistics_amount_by_bucket.h b/src/include/merchant-database/lookup_statistics_amount_by_bucket.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** * Returns amount-valued statistics by bucket. diff --git a/src/include/merchant-database/lookup_statistics_amount_by_bucket2.h b/src/include/merchant-database/lookup_statistics_amount_by_bucket2.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_statistics_amount_by_interval.h b/src/include/merchant-database/lookup_statistics_amount_by_interval.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_statistics_counter_by_bucket.h b/src/include/merchant-database/lookup_statistics_counter_by_bucket.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_statistics_counter_by_bucket2.h b/src/include/merchant-database/lookup_statistics_counter_by_bucket2.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_statistics_counter_by_interval.h b/src/include/merchant-database/lookup_statistics_counter_by_interval.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_template.h b/src/include/merchant-database/lookup_template.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_templates.h b/src/include/merchant-database/lookup_templates.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_token_families.h b/src/include/merchant-database/lookup_token_families.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** * Typically called by `lookup_token_families`. diff --git a/src/include/merchant-database/lookup_token_family.h b/src/include/merchant-database/lookup_token_family.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_token_family_key.h b/src/include/merchant-database/lookup_token_family_key.h @@ -24,7 +24,7 @@ #include <gnunet/gnunet_common.h> #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_token_family_keys.h b/src/include/merchant-database/lookup_token_family_keys.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/lookup_token_family_key.h" diff --git a/src/include/merchant-database/lookup_transfer_details.h b/src/include/merchant-database/lookup_transfer_details.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_transfer_details_by_order.h b/src/include/merchant-database/lookup_transfer_details_by_order.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_transfer_summary.h b/src/include/merchant-database/lookup_transfer_summary.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_transfers.h b/src/include/merchant-database/lookup_transfers.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_units.h b/src/include/merchant-database/lookup_units.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_webhook.h b/src/include/merchant-database/lookup_webhook.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/lookup_webhook_by_event.h b/src/include/merchant-database/lookup_webhook_by_event.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_webhooks.h b/src/include/merchant-database/lookup_webhooks.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/lookup_wire_fee.h b/src/include/merchant-database/lookup_wire_fee.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/mark_contract_paid.h b/src/include/merchant-database/mark_contract_paid.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/mark_order_wired.h b/src/include/merchant-database/mark_order_wired.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/preflight.h b/src/include/merchant-database/preflight.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/purge_instance.h b/src/include/merchant-database/purge_instance.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/refund_coin.h b/src/include/merchant-database/refund_coin.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_account.h b/src/include/merchant-database/select_account.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_account_by_uri.h b/src/include/merchant-database/select_account_by_uri.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_accounts.h b/src/include/merchant-database/select_accounts.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_accounts_by_exchange.h b/src/include/merchant-database/select_accounts_by_exchange.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/select_all_donau_instances.h b/src/include/merchant-database/select_all_donau_instances.h @@ -25,7 +25,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> #include "donau/donau_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/select_category.h b/src/include/merchant-database/select_category.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_category_by_name.h b/src/include/merchant-database/select_category_by_name.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_donau_instance_by_serial.h b/src/include/merchant-database/select_donau_instance_by_serial.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "donau/donau_util.h" diff --git a/src/include/merchant-database/select_donau_instances.h b/src/include/merchant-database/select_donau_instances.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_donau_instances_filtered.h b/src/include/merchant-database/select_donau_instances_filtered.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "donau/donau_util.h" diff --git a/src/include/merchant-database/select_exchange_keys.h b/src/include/merchant-database/select_exchange_keys.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_exchanges.h b/src/include/merchant-database/select_exchanges.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_login_token.h b/src/include/merchant-database/select_login_token.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_money_pot.h b/src/include/merchant-database/select_money_pot.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_money_pots.h b/src/include/merchant-database/select_money_pots.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/select_open_transfers.h b/src/include/merchant-database/select_open_transfers.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_order_blinded_sigs.h b/src/include/merchant-database/select_order_blinded_sigs.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_otp.h b/src/include/merchant-database/select_otp.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_otp_serial.h b/src/include/merchant-database/select_otp_serial.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_product_groups.h b/src/include/merchant-database/select_product_groups.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/select_report.h b/src/include/merchant-database/select_report.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_reports.h b/src/include/merchant-database/select_reports.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/select_unit.h b/src/include/merchant-database/select_unit.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/select_wirewatch_accounts.h b/src/include/merchant-database/select_wirewatch_accounts.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/solve_mfa_challenge.h b/src/include/merchant-database/solve_mfa_challenge.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/start.h b/src/include/merchant-database/start.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" /** diff --git a/src/include/merchant-database/store_wire_fee_by_exchange.h b/src/include/merchant-database/store_wire_fee_by_exchange.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/unlock_inventory.h b/src/include/merchant-database/unlock_inventory.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_account.h b/src/include/merchant-database/update_account.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_category.h b/src/include/merchant-database/update_category.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_contract_session.h b/src/include/merchant-database/update_contract_session.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_contract_terms.h b/src/include/merchant-database/update_contract_terms.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_deposit_confirmation_status.h b/src/include/merchant-database/update_deposit_confirmation_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_donau_instance.h b/src/include/merchant-database/update_donau_instance.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "donau/donau_service.h" diff --git a/src/include/merchant-database/update_donau_instance_receipts_amount.h b/src/include/merchant-database/update_donau_instance_receipts_amount.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_instance.h b/src/include/merchant-database/update_instance.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_instance_auth.h b/src/include/merchant-database/update_instance_auth.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_mfa_challenge.h b/src/include/merchant-database/update_mfa_challenge.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_money_pot.h b/src/include/merchant-database/update_money_pot.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_otp.h b/src/include/merchant-database/update_otp.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_pending_webhook.h b/src/include/merchant-database/update_pending_webhook.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_product.h b/src/include/merchant-database/update_product.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_product_group.h b/src/include/merchant-database/update_product_group.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_report.h b/src/include/merchant-database/update_report.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_report_status.h b/src/include/merchant-database/update_report_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_template.h b/src/include/merchant-database/update_template.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_token_family.h b/src/include/merchant-database/update_token_family.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_transfer_status.h b/src/include/merchant-database/update_transfer_status.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_unit.h b/src/include/merchant-database/update_unit.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_webhook.h b/src/include/merchant-database/update_webhook.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/update_wirewatch_progress.h b/src/include/merchant-database/update_wirewatch_progress.h @@ -23,7 +23,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" struct TALER_MERCHANTDB_PostgresContext; diff --git a/src/include/merchant-database/upsert_donau_keys.h b/src/include/merchant-database/upsert_donau_keys.h @@ -24,7 +24,7 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "donau/donau_service.h" diff --git a/src/include/merchantdb_lib.h b/src/include/merchantdb_lib.h @@ -0,0 +1,962 @@ +/* + This file is part of TALER + Copyright (C) 2014, 2015, 2016, 2020 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING.GPL. If not, see <http://www.gnu.org/licenses/> +*/ + +/** + * @file src/include/merchantdb_lib.h + * @brief database helper functions used by the merchant backend + * @author Sree Harsha Totakura <sreeharsha@totakura.in> + */ +#ifndef TALER_MERCHANTDB_LIB_H +#define TALER_MERCHANTDB_LIB_H + +#include <gnunet/gnunet_pq_lib.h> +#include <taler/taler_util.h> + +/** + * Handle to interact with the database. + */ +struct TALER_MERCHANTDB_PostgresContext; + +GNUNET_NETWORK_STRUCT_BEGIN + +/** + * Format of the data hashed to generate the notification + * string whenever the KYC status for an account has + * changed. + */ +struct TALER_MERCHANTDB_MerchantKycStatusChangeEventP +{ + /** + * Type is TALER_DBEVENT_MERCHANT_EXCHANGE_KYC_STATUS_CHANGED. + */ + struct GNUNET_DB_EventHeaderP header; + + /** + * Salted hash of the affected account. + */ + struct TALER_MerchantWireHashP h_wire; +}; + +/** + * Event triggered when an order is paid. + */ +struct TMH_OrderPayEventP +{ + /** + * Type is #TALER_DBEVENT_MERCHANT_ORDER_PAID + */ + struct GNUNET_DB_EventHeaderP header; + + /** + * Always zero (for alignment). + */ + uint32_t reserved GNUNET_PACKED; + + /** + * Merchant's public key + */ + struct TALER_MerchantPublicKeyP merchant_pub; + + /** + * Hash of the order ID. + */ + struct GNUNET_HashCode h_order_id; +}; + + +GNUNET_NETWORK_STRUCT_END + + +/** + * Connect to postgresql database + * + * @param cfg the configuration handle + * @return connection to the database; NULL upon error + */ +struct TALER_MERCHANTDB_PostgresContext * +TALER_MERCHANTDB_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); + + +/** + * Disconnect from the database + * + * @param pg database handle to close + */ +void +TALER_MERCHANTDB_disconnect (struct TALER_MERCHANTDB_PostgresContext *pg); + + +void +check_connection (struct TALER_MERCHANTDB_PostgresContext *pg); + + +/** + * Possible token family kinds. + */ +enum TALER_MERCHANTDB_TokenFamilyKind +{ + + /** + * Token family representing a discount token + */ + TALER_MERCHANTDB_TFK_Discount = 0, + + /** + * Token family representing a subscription token + */ + TALER_MERCHANTDB_TFK_Subscription = 1, + +}; + +/** + * Results from trying to increase a refund. + */ +enum TALER_MERCHANTDB_RefundStatus +{ + + /** + * Refund amount exceeds legal exchange limits. + */ + TALER_MERCHANTDB_RS_LEGAL_FAILURE = -5, + + /** + * Refund amount currency does not match original payment. + */ + TALER_MERCHANTDB_RS_BAD_CURRENCY = -4, + + /** + * Refund amount exceeds original payment. + */ + TALER_MERCHANTDB_RS_TOO_HIGH = -3, + + /** + * Hard database failure. + */ + TALER_MERCHANTDB_RS_HARD_ERROR = -2, + + /** + * Soft database failure. + */ + TALER_MERCHANTDB_RS_SOFT_ERROR = -1, + + /** + * Order not found. + */ + TALER_MERCHANTDB_RS_NO_SUCH_ORDER = 0, + + /** + * Refund is now at or above the requested amount. + */ + TALER_MERCHANTDB_RS_SUCCESS = 1 + +}; + +/** + * Details about an OTP device. + */ +struct TALER_MERCHANTDB_OtpDeviceDetails +{ + + /** + * Description of the device. + */ + char *otp_description; + + /** + * Current usage counter value. + */ + uint64_t otp_ctr; + + /** + * Base64-encoded key. + */ + char *otp_key; + + /** + * Algorithm used to compute purchase confirmations. + */ + enum TALER_MerchantConfirmationAlgorithm otp_algorithm; +}; + + +/** + * Details about a template. + */ +struct TALER_MERCHANTDB_TemplateDetails +{ + /** + * Description of the template. + */ + char *template_description; + + /** + * In this template contract, we can have additional information. + */ + json_t *template_contract; + + /** + * ID of the OTP device linked to the template, or NULL. + */ + char *otp_id; + + /** + * Editable default values for fields not specified + * in the @e template_contract. NULL if the user + * cannot edit anything. + */ + json_t *editable_defaults; + +}; + + +/** + * Structure to hold Donau instance details from the database. + */ +struct TALER_MERCHANTDB_DonauInstance +{ + /** + * Donau instance serial + */ + uint64_t donau_instance_serial; + + /** + * The URL for the Donau instance. + */ + char *donau_url; + + /** + * The name of the charity associated with the Donau instance. + */ + char *charity_name; + + /** + * Pointer to the public key of the charity, used for cryptographic operations. + * This is represented as an EDDSA public key structure. + */ + struct DONAU_CharityPublicKeyP *charity_pub_key; + + /** + * A unique identifier for the charity in the Donau instance. + */ + uint64_t charity_id; + + /** + * The maximum allowable amount for donations to this charity in the current year. + * This is tracked for regulatory or internal business constraints. + */ + struct TALER_Amount charity_max_per_year; + + /** + * The total amount of donations received by the charity in the current year. + * This field helps track progress toward the yearly donation limit. + */ + struct TALER_Amount charity_receipts_to_date; + + /** + * The current year being tracked for donations. + * This is used to differentiate donation data between years. + */ + int64_t current_year; + + /** + * A JSON object containing key information specific to the Donau instance, + * such as cryptographic keys or other relevant details. + */ + json_t *donau_keys_json; +}; + + +/** + * Details about a product. + * + * FIXME: reuse TALER_MERCHANT_Product as a member in this structure! + */ +struct TALER_MERCHANTDB_ProductDetails +{ + /** + * Name of the product. + */ + char *product_name; + + /** + * Description of the product. + */ + char *description; + + /** + * Internationalized description. + */ + json_t *description_i18n; + + /** + * Unit in which the product is sold. + */ + char *unit; + + /** + * Optional list of per-unit prices. When NULL or empty, @e price + * must be used as the canonical single price. + */ + struct TALER_Amount *price_array; + + /** + * Number of entries in @e price_array. + */ + size_t price_array_length; + + /** + * Base64-encoded product image, or an empty string. + */ + char *image; + + /** + * Hash of the product image data, or NULL. + */ + char *image_hash; + + /** + * List of taxes the merchant pays for this product. Never NULL, + * but can be an empty array. + */ + json_t *taxes; + + /** + * Number of units of the product in stock in sum in total, including all + * existing sales and lost product, in product-specific units. UINT64_MAX + * indicates "infinite". + */ + uint64_t total_stock; + + /** + * Fractional part of stock in units of 1/1000000 of the base value. + */ + uint32_t total_stock_frac; + + /** + * Honor fractional stock if TRUE, else only integer stock. + */ + bool allow_fractional_quantity; + + /** + * Precision level (number of decimal places) to apply when + * fractional quantities are enabled. + */ + uint32_t fractional_precision_level; + + /** + * Number of units of the product in sold, in product-specific units. + */ + uint64_t total_sold; + + /** + * Fractional part of units sold in units of 1/1000000 of the base value. + */ + uint32_t total_sold_frac; + + /** + * Number of units of stock lost. + */ + uint64_t total_lost; + + /** + * Fractional part of lost units in units of 1/1000000 of the base value. + */ + uint32_t total_lost_frac; + + /** + * Identifies where the product is in stock, possibly an empty map. + */ + json_t *address; + + /** + * Identifies when the product will be restocked. 0 for unknown, + * #GNUNET_TIME_UNIT_FOREVER_ABS for never. + */ + struct GNUNET_TIME_Timestamp next_restock; + + /** + * Minimum required age for consumers buying this product. + * Default is 0. Only enforced of an exchange supports age + * restrictions. + */ + uint32_t minimum_age; + + /** + * Group in which the product is in. 0 for default group. + */ + uint64_t product_group_id; + + /** + * Money pot into which sales of this product should go into by default. + */ + uint64_t money_pot_id; + + /** + * True if the price for this product is given in net, + * False if its the gross price. + */ + bool price_is_net; + +}; + + +/** + * Details about a webhook. + */ +struct TALER_MERCHANTDB_WebhookDetails +{ + + /** + * event of the webhook. + */ + char *event_type; + + /** + * URL of the webhook. The customer will be redirected on this url. + */ + char *url; + + /** + * Http method used by the webhook. + */ + char *http_method; + + /** + * Header template of the webhook. + */ + char *header_template; + + /** + * Body template of the webhook. + */ + char *body_template; + +}; + + +/** + * Details about a product category. + */ +struct TALER_MERCHANTDB_CategoryDetails +{ + + /** + * Name of the category. + */ + char *category_name; + + /** + * Translations of the name of the category. + */ + json_t *category_name_i18n; + +}; + + +/** + * Details about the pending webhook. + */ +struct TALER_MERCHANTDB_PendingWebhookDetails +{ + + /** + * Identifies when we should make the next request to the webhook. 0 for unknown, + * #GNUNET_TIME_UNIT_FOREVER_ABS for never. + */ + struct GNUNET_TIME_Absolute next_attempt; + + /** + * How often have we tried this request so far. + */ + uint32_t retries; + + /** + * URL of the webhook. The customer will be redirected on this url. + */ + char *url; + + /** + * Http method used for the webhook. + */ + char *http_method; + + /** + * Header of the webhook. + */ + char *header; + + /** + * Body of the webhook. + */ + char *body; + +}; + + +/** + * Details about a token family. + */ +struct TALER_MERCHANTDB_TokenFamilyDetails +{ + /** + * Token family slug used for identification. + */ + char *slug; + + /** + * User readable name of the token family. + */ + char *name; + + /** + * Description of the token family. + */ + char *description; + + /** + * Internationalized token family description. + */ + json_t *description_i18n; + + /** + * Meta-data associated with the token family. + * Includes information like "trusted_domains" or + * "expected_domains", if set. + */ + json_t *extra_data; + + /** + * Cipher that should be used for this token family. Note: We do not expose + * this over the API and do not let clients set it. NULL for default (when + * calling database). + */ + char *cipher_spec; + + /** + * Start time of the token family duration. + */ + struct GNUNET_TIME_Timestamp valid_after; + + /** + * End time of the token family duration. + */ + struct GNUNET_TIME_Timestamp valid_before; + + /** + * Validity duration of the token family. Must be larger or + * equal to @a rounding plus @a start_offset_s. + */ + struct GNUNET_TIME_Relative duration; + + /** + * Rounding duration of the token family. + */ + struct GNUNET_TIME_Relative validity_granularity; + + /** + * Offset (in seconds) to subtract from the rounded + * validity start period. + */ + struct GNUNET_TIME_Relative start_offset; + + /** + * Token family kind. + */ + enum TALER_MERCHANTDB_TokenFamilyKind kind; + + /** + * Counter for each issued token of this family. + */ + uint64_t issued; + + /** + * Counter for each used token of this family. + */ + uint64_t used; +}; + + +/** + * Minimal product details for inventory templates. + */ +struct TALER_MERCHANTDB_InventoryProductDetails +{ + /** + * Name of the product. + */ + char *product_name; + + /** + * Description of the product. + */ + char *description; + + /** + * Internationalized description. + */ + json_t *description_i18n; + + /** + * Unit in which the product is sold. + */ + char *unit; + + /** + * List of per-unit prices. + */ + struct TALER_Amount *price_array; + + /** + * Number of entries in @e price_array. + */ + size_t price_array_length; + + /** + * Hash of the product image data, or NULL. + */ + char *image_hash; + + /** + * Honor fractional stock if TRUE, else only integer stock. + */ + bool allow_fractional_quantity; + + /** + * Precision level (number of decimal places) to apply when + * fractional quantities are enabled. + */ + uint32_t fractional_precision_level; + + /** + * Remaining units after sold/lost/locked deductions. + */ + uint64_t remaining_stock; + + /** + * Fractional part of remaining units in units of 1/1000000 of the base value. + */ + uint32_t remaining_stock_frac; + + /** + * List of taxes the merchant pays for this product. Never NULL, + * but can be an empty array. + */ + json_t *taxes; +}; + + +/** + * Details about an inventory measurement unit. + */ +struct TALER_MERCHANTDB_UnitDetails +{ + + /** + * Database serial. + */ + uint64_t unit_serial; + + /** + * Backend identifier used in product payloads. + */ + char *unit; + + /** + * Default long label (fallback string). + */ + char *unit_name_long; + + /** + * Default short label (fallback string). + */ + char *unit_name_short; + + /** + * Internationalised long labels. + */ + json_t *unit_name_long_i18n; + + /** + * Internationalised short labels. + */ + json_t *unit_name_short_i18n; + + /** + * Whether fractional quantities are enabled by default. + */ + bool unit_allow_fraction; + + /** + * Maximum number of fractional digits honoured by default. + */ + uint32_t unit_precision_level; + + /** + * Hidden from selectors when false. + */ + bool unit_active; + + /** + * Built-in units cannot be deleted. + */ + bool unit_builtin; +}; + + +/** + * Details about a wire account of the merchant. + */ +struct TALER_MERCHANTDB_AccountDetails +{ + /** + * Hash of the wire details (@e payto_uri and @e salt). + */ + struct TALER_MerchantWireHashP h_wire; + + /** + * Salt value used for hashing @e payto_uri. + */ + struct TALER_WireSaltP salt; + + /** + * Instance ID. Do not free (may be aliased with + * the instance ID given in the query!). + * FIXME: set in all functions involving this struct! + */ + const char *instance_id; + + /** + * Actual account address as a payto://-URI. + */ + struct TALER_FullPayto payto_uri; + + /** + * Where can the taler-merchant-wirewatch helper + * download information about incoming transfers? + * NULL if not available. + */ + char *credit_facade_url; + + /** + * JSON with credentials to use to access the + * @e credit_facade_url. + */ + json_t *credit_facade_credentials; + + /** + * Additional meta data to include in wire transfers to this + * account. Can be NULL if not used. + */ + char *extra_wire_subject_metadata; + + /** + * Is the account set for active use in new contracts? + */ + bool active; + +}; + + +/** + * Binary login token. Just a vanilla token made out + * of random bits. + */ +struct TALER_MERCHANTDB_LoginTokenP +{ + /** + * 32 bytes of entropy. + */ + uint64_t data[32 / 8]; +}; + +/** + * Authentication settings for an instance. + */ +struct TALER_MERCHANTDB_InstanceAuthSettings +{ + /** + * Hash used for authentication. All zero if authentication is off. + */ + struct TALER_MerchantAuthenticationHashP auth_hash; + + /** + * Salt used to hash the "Authentication" header, the result must then + * match the @e auth_hash. + */ + struct TALER_MerchantAuthenticationSaltP auth_salt; +}; + + +/** + * General settings for an instance. + */ +struct TALER_MERCHANTDB_InstanceSettings +{ + /** + * prefix for the instance under "/instances/" + */ + char *id; + + /** + * legal name of the instance + */ + char *name; + + /** + * merchant's site url + */ + char *website; + + /** + * email contact for password reset / possibly admin / customers + */ + char *email; + + /** + * phone contact for password reset / possibly admin / customers + */ + char *phone; + + /** + * merchant's logo data uri + */ + char *logo; + + /** + * Address of the business + */ + json_t *address; + + /** + * jurisdiction of the business + */ + json_t *jurisdiction; + + /** + * Use STEFAN curves to determine acceptable + * fees by default (otherwise: accept no fees by default). + */ + bool use_stefan; + + /** + * True of @e phone was validated. + */ + bool phone_validated; + + /** + * True of @e email was validated. + */ + bool email_validated; + + /** + * If the frontend does NOT specify an execution date, how long should + * we tell the exchange to wait to aggregate transactions before + * executing the wire transfer? This delay is added to the current + * time when we generate the advisory execution time for the exchange. + */ + struct GNUNET_TIME_Relative default_wire_transfer_delay; + + /** + * If the frontend does NOT specify a payment deadline, how long should + * offers we make be valid by default? + */ + struct GNUNET_TIME_Relative default_pay_delay; + + /** + * If the frontend does NOT specify a refund deadline, how long should + * refunds be possible? + */ + struct GNUNET_TIME_Relative default_refund_delay; + + /** + * How much should we round up the wire transfer deadline computed by + * adding the @e default_wire_transfer_delay to the refund deadline. + */ + enum GNUNET_TIME_RounderInterval default_wire_transfer_rounding_interval; + +}; + + +/** + * Free members of @a pd, but not @a pd itself. + * + * @param[in] pd product details to clean up + */ +void +TALER_MERCHANTDB_product_details_free ( + struct TALER_MERCHANTDB_ProductDetails *pd); + + +/** + * Free members of @a tp, but not @a tp itself. + * + * @param[in] tp template details to clean up + */ +void +TALER_MERCHANTDB_template_details_free ( + struct TALER_MERCHANTDB_TemplateDetails *tp); + + +/** + * Free members of @a wb, but not @a wb itself. + * + * @param[in] wb webhook details to clean up + */ +void +TALER_MERCHANTDB_webhook_details_free ( + struct TALER_MERCHANTDB_WebhookDetails *wb); + +/** + * Free members of @a pwb, but not @a pwb itself. + * + * @param[in] pwb pending webhook details to clean up + */ +void +TALER_MERCHANTDB_pending_webhook_details_free ( + struct TALER_MERCHANTDB_PendingWebhookDetails *pwb); + + +/** + * Free members of @a tf, but not @a tf itself. + * + * @param[in] tf token family details to clean up + */ +void +TALER_MERCHANTDB_token_family_details_free ( + struct TALER_MERCHANTDB_TokenFamilyDetails *tf); + + +/** + * Free members of @a cd, but not @a cd itself. + * + * @param[in] cd token family details to clean up + */ +void +TALER_MERCHANTDB_category_details_free ( + struct TALER_MERCHANTDB_CategoryDetails *cd); + +/** + * Free members of @a ud, but not @a ud itself. + * + * @param[in] ud unit details to clean up + */ +void +TALER_MERCHANTDB_unit_details_free ( + struct TALER_MERCHANTDB_UnitDetails *ud); + +#endif /* MERCHANT_DB_H */ + +/* end of taler_merchantdb_lib.h */ diff --git a/src/include/platform.h b/src/include/platform.h @@ -0,0 +1,334 @@ +/* + This file is part of TALER + Copyright (C) 2014, 2015, 2016, 2021 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU Affero General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> +*/ + +/** + * @file src/include/platform.h + * @brief This file contains the includes and definitions which are used by the + * rest of the modules + * @author Sree Harsha Totakura <sreeharsha@totakura.in> + */ + +#ifndef PLATFORM_H_ +#define PLATFORM_H_ + +/* Include our configuration header */ +#ifndef HAVE_USED_CONFIG_H +#define HAVE_USED_CONFIG_H +#ifdef HAVE_CONFIG_H +#include "taler_merchant_config.h" +#endif +#endif + + +#if (GNUNET_EXTRA_LOGGING >= 1) +#define VERBOSE(cmd) cmd +#else +#define VERBOSE(cmd) do { break; } while (0) +#endif + +/* Include the features available for GNU source */ +#define _GNU_SOURCE + + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef __clang__ +#undef HAVE_STATIC_ASSERT +#endif + +/** + * These may be expensive, but good for debugging... + */ +#define ALLOW_EXTRA_CHECKS GNUNET_YES + +/** + * For strptime (glibc2 needs this). + */ +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 499 +#endif + +#ifndef _REENTRANT +#define _REENTRANT +#endif + +/* configuration options */ + +#define VERBOSE_STATS 0 + +#include <netdb.h> +#include <sys/socket.h> +#include <sys/un.h> +#if HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#if HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#if HAVE_NETINET_IP_H +#include <netinet/ip.h> /* superset of previous */ +#endif +#include <arpa/inet.h> +#include <netinet/tcp.h> +#include <pwd.h> +#include <sys/ioctl.h> +#include <sys/wait.h> +#include <grp.h> + +#include <string.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <stdarg.h> +#include <stdbool.h> +#include <errno.h> +#include <signal.h> +#include <libgen.h> +#ifdef HAVE_MALLOC_H +#include <malloc.h> /* for mallinfo on GNU */ +#endif +#include <unistd.h> /* KLB_FIX */ +#include <sys/stat.h> +#include <sys/types.h> +#include <dirent.h> /* KLB_FIX */ +#include <fcntl.h> +#include <math.h> +#if HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#if HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#include <time.h> +#ifdef BSD +#include <net/if.h> +#endif +#if defined(BSD) && defined(__FreeBSD__) && defined(__FreeBSD_kernel__) +#include <semaphore.h> +#endif +#ifdef DARWIN +#include <dlfcn.h> +#include <semaphore.h> +#include <net/if.h> +#endif +#if defined(__linux__) || defined(GNU) +#include <net/if.h> +#endif +#ifdef SOLARIS +#include <sys/sockio.h> +#include <sys/filio.h> +#include <sys/loadavg.h> +#include <semaphore.h> +#endif +#if HAVE_UCRED_H +#include <ucred.h> +#endif +#if HAVE_SYS_UCRED_H +#include <sys/ucred.h> +#endif +#if HAVE_IFADDRS_H +#include <ifaddrs.h> +#endif +#include <errno.h> +#include <limits.h> + +#if HAVE_VFORK_H +#include <vfork.h> +#endif + +#include <ctype.h> +#if HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif + +#if HAVE_ENDIAN_H +#include <endian.h> +#endif +#if HAVE_SYS_ENDIAN_H +#include <sys/endian.h> +#endif + +#define DIR_SEPARATOR '/' +#define DIR_SEPARATOR_STR "/" +#define PATH_SEPARATOR ':' +#define PATH_SEPARATOR_STR ":" +#define NEWLINE "\n" + +#include <locale.h> +#include <taler/gettext.h> +/** + * GNU gettext support macro. + */ +#define _(String) dgettext (PACKAGE, String) +#define LIBEXTRACTOR_GETTEXT_DOMAIN "libextractor" + +#include <sys/mman.h> + +/* FreeBSD_kernel is not defined on the now discontinued kFreeBSD */ +#if defined(BSD) && defined(__FreeBSD__) && defined(__FreeBSD_kernel__) +#define __BYTE_ORDER BYTE_ORDER +#define __BIG_ENDIAN BIG_ENDIAN +#endif + +#ifdef DARWIN +#define __BYTE_ORDER BYTE_ORDER +#define __BIG_ENDIAN BIG_ENDIAN +/* not available on darwin, override configure */ +#undef HAVE_STAT64 +#undef HAVE_MREMAP +#endif + +#if ! HAVE_ATOLL +long long +atoll (const char *nptr); + +#endif + +#if ENABLE_NLS +#include "langinfo.h" +#endif + +#ifndef SIZE_MAX +#define SIZE_MAX ((size_t) (-1)) +#endif + +#ifndef O_LARGEFILE +#define O_LARGEFILE 0 +#endif + +/** + * AI_NUMERICSERV not defined in windows. Then we just do without. + */ +#ifndef AI_NUMERICSERV +#define AI_NUMERICSERV 0 +#endif + + +#if defined(__sparc__) +#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove (&__tmp, &(val), \ + sizeof((val))); \ + __tmp; }) +#else +#define MAKE_UNALIGNED(val) val +#endif + +/** + * The termination signal + */ +#define GNUNET_TERM_SIG SIGTERM + + +#ifndef PATH_MAX +/** + * Assumed maximum path length. + */ +#define PATH_MAX 4096 +#endif + +#if HAVE_THREAD_LOCAL_GCC +#define TALER_THREAD_LOCAL __thread +#else +#define TALER_THREAD_LOCAL +#endif + + +/** + * clang et al do not have such an attribute + */ +#if __has_attribute (__nonstring__) +# define __nonstring __attribute__((__nonstring__)) +#else +# define __nonstring +#endif + +/* Do not use shortcuts for gcrypt mpi */ +#define GCRYPT_NO_MPI_MACROS 1 + +/* Do not use deprecated functions from gcrypt */ +#define GCRYPT_NO_DEPRECATED 1 + +/* Ignore MHD deprecations for now as we want to be compatible + to "ancient" MHD releases. */ +#define MHD_NO_DEPRECATION 1 + + +/** + * Required prefix for the authorization header as per RFC 8959. + * (Follows RFC 6750 albeit technically violates RFC 7235, but + * Mark Nottingham thinks this should be fixed by revising HTTP + * spec (https://github.com/httpwg/http-core/issues/733)) + */ +#define RFC_8959_PREFIX "secret-token:" + +/* LSB-style exit status codes */ +#ifndef EXIT_INVALIDARGUMENT +/** + * Command-line arguments are invalid. + * Restarting useless. + */ +#define EXIT_INVALIDARGUMENT 2 +#endif + +#ifndef EXIT_NOTIMPLEMENTED +/** + * The requested operation is not implemented. + * Restarting useless. + */ +#define EXIT_NOTIMPLEMENTED 3 +#endif + +#ifndef EXIT_NOPERMISSION +/** + * Permissions needed to run are not available. + * Restarting useless. + */ +#define EXIT_NOPERMISSION 4 +#endif + +#ifndef EXIT_NOTINSTALLED +/** + * Key resources are not installed. + * Restarting useless. + */ +#define EXIT_NOTINSTALLED 5 +#endif + +#ifndef EXIT_NOTCONFIGURED +/** + * Key configuration settings are missing or invalid. + * Restarting useless. + */ +#define EXIT_NOTCONFIGURED 6 +#endif + +#ifndef EXIT_NOTRUNNING +#define EXIT_NOTRUNNING 7 +#endif + +#ifndef EXIT_NO_RESTART +/** + * Exit code from 'main' if we do not want to be restarted, + * except by manual intervention (hard failure). + */ +#define EXIT_NO_RESTART 9 +#endif + + +#endif /* PLATFORM_H_ */ + +/* end of platform.h */ diff --git a/src/include/taler/meson.build b/src/include/taler/meson.build @@ -3,8 +3,6 @@ subdir('merchant') talerinclude_HEADERS = [ 'taler_merchant_bank_lib.h', - 'taler_merchantdb_lib.h', - 'taler_merchantdb_plugin.h', 'taler_merchant_util.h', 'taler_merchant_service.h', 'taler_merchant_pay_service.h', @@ -16,5 +14,3 @@ foreach h : talerinclude_HEADERS install_headers(h, install_dir: get_option('includedir') / 'taler') endforeach - - diff --git a/src/include/taler/platform.h b/src/include/taler/platform.h @@ -1,334 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014, 2015, 2016, 2021 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU Affero General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> -*/ - -/** - * @file src/include/taler/platform.h - * @brief This file contains the includes and definitions which are used by the - * rest of the modules - * @author Sree Harsha Totakura <sreeharsha@totakura.in> - */ - -#ifndef PLATFORM_H_ -#define PLATFORM_H_ - -/* Include our configuration header */ -#ifndef HAVE_USED_CONFIG_H -#define HAVE_USED_CONFIG_H -#ifdef HAVE_CONFIG_H -#include "taler_merchant_config.h" -#endif -#endif - - -#if (GNUNET_EXTRA_LOGGING >= 1) -#define VERBOSE(cmd) cmd -#else -#define VERBOSE(cmd) do { break; } while (0) -#endif - -/* Include the features available for GNU source */ -#define _GNU_SOURCE - - -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - -#ifdef __clang__ -#undef HAVE_STATIC_ASSERT -#endif - -/** - * These may be expensive, but good for debugging... - */ -#define ALLOW_EXTRA_CHECKS GNUNET_YES - -/** - * For strptime (glibc2 needs this). - */ -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 499 -#endif - -#ifndef _REENTRANT -#define _REENTRANT -#endif - -/* configuration options */ - -#define VERBOSE_STATS 0 - -#include <netdb.h> -#include <sys/socket.h> -#include <sys/un.h> -#if HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#if HAVE_NETINET_IN_SYSTM_H -#include <netinet/in_systm.h> -#endif -#if HAVE_NETINET_IP_H -#include <netinet/ip.h> /* superset of previous */ -#endif -#include <arpa/inet.h> -#include <netinet/tcp.h> -#include <pwd.h> -#include <sys/ioctl.h> -#include <sys/wait.h> -#include <grp.h> - -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <stdarg.h> -#include <stdbool.h> -#include <errno.h> -#include <signal.h> -#include <libgen.h> -#ifdef HAVE_MALLOC_H -#include <malloc.h> /* for mallinfo on GNU */ -#endif -#include <unistd.h> /* KLB_FIX */ -#include <sys/stat.h> -#include <sys/types.h> -#include <dirent.h> /* KLB_FIX */ -#include <fcntl.h> -#include <math.h> -#if HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif -#if HAVE_SYS_TIME_H -#include <sys/time.h> -#endif -#include <time.h> -#ifdef BSD -#include <net/if.h> -#endif -#if defined(BSD) && defined(__FreeBSD__) && defined(__FreeBSD_kernel__) -#include <semaphore.h> -#endif -#ifdef DARWIN -#include <dlfcn.h> -#include <semaphore.h> -#include <net/if.h> -#endif -#if defined(__linux__) || defined(GNU) -#include <net/if.h> -#endif -#ifdef SOLARIS -#include <sys/sockio.h> -#include <sys/filio.h> -#include <sys/loadavg.h> -#include <semaphore.h> -#endif -#if HAVE_UCRED_H -#include <ucred.h> -#endif -#if HAVE_SYS_UCRED_H -#include <sys/ucred.h> -#endif -#if HAVE_IFADDRS_H -#include <ifaddrs.h> -#endif -#include <errno.h> -#include <limits.h> - -#if HAVE_VFORK_H -#include <vfork.h> -#endif - -#include <ctype.h> -#if HAVE_SYS_RESOURCE_H -#include <sys/resource.h> -#endif - -#if HAVE_ENDIAN_H -#include <endian.h> -#endif -#if HAVE_SYS_ENDIAN_H -#include <sys/endian.h> -#endif - -#define DIR_SEPARATOR '/' -#define DIR_SEPARATOR_STR "/" -#define PATH_SEPARATOR ':' -#define PATH_SEPARATOR_STR ":" -#define NEWLINE "\n" - -#include <locale.h> -#include <taler/gettext.h> -/** - * GNU gettext support macro. - */ -#define _(String) dgettext (PACKAGE, String) -#define LIBEXTRACTOR_GETTEXT_DOMAIN "libextractor" - -#include <sys/mman.h> - -/* FreeBSD_kernel is not defined on the now discontinued kFreeBSD */ -#if defined(BSD) && defined(__FreeBSD__) && defined(__FreeBSD_kernel__) -#define __BYTE_ORDER BYTE_ORDER -#define __BIG_ENDIAN BIG_ENDIAN -#endif - -#ifdef DARWIN -#define __BYTE_ORDER BYTE_ORDER -#define __BIG_ENDIAN BIG_ENDIAN -/* not available on darwin, override configure */ -#undef HAVE_STAT64 -#undef HAVE_MREMAP -#endif - -#if ! HAVE_ATOLL -long long -atoll (const char *nptr); - -#endif - -#if ENABLE_NLS -#include "langinfo.h" -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX ((size_t) (-1)) -#endif - -#ifndef O_LARGEFILE -#define O_LARGEFILE 0 -#endif - -/** - * AI_NUMERICSERV not defined in windows. Then we just do without. - */ -#ifndef AI_NUMERICSERV -#define AI_NUMERICSERV 0 -#endif - - -#if defined(__sparc__) -#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove (&__tmp, &(val), \ - sizeof((val))); \ - __tmp; }) -#else -#define MAKE_UNALIGNED(val) val -#endif - -/** - * The termination signal - */ -#define GNUNET_TERM_SIG SIGTERM - - -#ifndef PATH_MAX -/** - * Assumed maximum path length. - */ -#define PATH_MAX 4096 -#endif - -#if HAVE_THREAD_LOCAL_GCC -#define TALER_THREAD_LOCAL __thread -#else -#define TALER_THREAD_LOCAL -#endif - - -/** - * clang et al do not have such an attribute - */ -#if __has_attribute (__nonstring__) -# define __nonstring __attribute__((__nonstring__)) -#else -# define __nonstring -#endif - -/* Do not use shortcuts for gcrypt mpi */ -#define GCRYPT_NO_MPI_MACROS 1 - -/* Do not use deprecated functions from gcrypt */ -#define GCRYPT_NO_DEPRECATED 1 - -/* Ignore MHD deprecations for now as we want to be compatible - to "ancient" MHD releases. */ -#define MHD_NO_DEPRECATION 1 - - -/** - * Required prefix for the authorization header as per RFC 8959. - * (Follows RFC 6750 albeit technically violates RFC 7235, but - * Mark Nottingham thinks this should be fixed by revising HTTP - * spec (https://github.com/httpwg/http-core/issues/733)) - */ -#define RFC_8959_PREFIX "secret-token:" - -/* LSB-style exit status codes */ -#ifndef EXIT_INVALIDARGUMENT -/** - * Command-line arguments are invalid. - * Restarting useless. - */ -#define EXIT_INVALIDARGUMENT 2 -#endif - -#ifndef EXIT_NOTIMPLEMENTED -/** - * The requested operation is not implemented. - * Restarting useless. - */ -#define EXIT_NOTIMPLEMENTED 3 -#endif - -#ifndef EXIT_NOPERMISSION -/** - * Permissions needed to run are not available. - * Restarting useless. - */ -#define EXIT_NOPERMISSION 4 -#endif - -#ifndef EXIT_NOTINSTALLED -/** - * Key resources are not installed. - * Restarting useless. - */ -#define EXIT_NOTINSTALLED 5 -#endif - -#ifndef EXIT_NOTCONFIGURED -/** - * Key configuration settings are missing or invalid. - * Restarting useless. - */ -#define EXIT_NOTCONFIGURED 6 -#endif - -#ifndef EXIT_NOTRUNNING -#define EXIT_NOTRUNNING 7 -#endif - -#ifndef EXIT_NO_RESTART -/** - * Exit code from 'main' if we do not want to be restarted, - * except by manual intervention (hard failure). - */ -#define EXIT_NO_RESTART 9 -#endif - - -#endif /* PLATFORM_H_ */ - -/* end of platform.h */ diff --git a/src/include/taler/taler_merchantdb_lib.h b/src/include/taler/taler_merchantdb_lib.h @@ -1,962 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014, 2015, 2016, 2020 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU Lesser General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING.GPL. If not, see <http://www.gnu.org/licenses/> -*/ - -/** - * @file src/include/taler/taler_merchantdb_lib.h - * @brief database helper functions used by the merchant backend - * @author Sree Harsha Totakura <sreeharsha@totakura.in> - */ -#ifndef TALER_MERCHANTDB_LIB_H -#define TALER_MERCHANTDB_LIB_H - -#include <gnunet/gnunet_pq_lib.h> -#include <taler/taler_util.h> - -/** - * Handle to interact with the database. - */ -struct TALER_MERCHANTDB_PostgresContext; - -GNUNET_NETWORK_STRUCT_BEGIN - -/** - * Format of the data hashed to generate the notification - * string whenever the KYC status for an account has - * changed. - */ -struct TALER_MERCHANTDB_MerchantKycStatusChangeEventP -{ - /** - * Type is TALER_DBEVENT_MERCHANT_EXCHANGE_KYC_STATUS_CHANGED. - */ - struct GNUNET_DB_EventHeaderP header; - - /** - * Salted hash of the affected account. - */ - struct TALER_MerchantWireHashP h_wire; -}; - -/** - * Event triggered when an order is paid. - */ -struct TMH_OrderPayEventP -{ - /** - * Type is #TALER_DBEVENT_MERCHANT_ORDER_PAID - */ - struct GNUNET_DB_EventHeaderP header; - - /** - * Always zero (for alignment). - */ - uint32_t reserved GNUNET_PACKED; - - /** - * Merchant's public key - */ - struct TALER_MerchantPublicKeyP merchant_pub; - - /** - * Hash of the order ID. - */ - struct GNUNET_HashCode h_order_id; -}; - - -GNUNET_NETWORK_STRUCT_END - - -/** - * Connect to postgresql database - * - * @param cfg the configuration handle - * @return connection to the database; NULL upon error - */ -struct TALER_MERCHANTDB_PostgresContext * -TALER_MERCHANTDB_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); - - -/** - * Disconnect from the database - * - * @param pg database handle to close - */ -void -TALER_MERCHANTDB_disconnect (struct TALER_MERCHANTDB_PostgresContext *pg); - - -void -check_connection (struct TALER_MERCHANTDB_PostgresContext *pg); - - -/** - * Possible token family kinds. - */ -enum TALER_MERCHANTDB_TokenFamilyKind -{ - - /** - * Token family representing a discount token - */ - TALER_MERCHANTDB_TFK_Discount = 0, - - /** - * Token family representing a subscription token - */ - TALER_MERCHANTDB_TFK_Subscription = 1, - -}; - -/** - * Results from trying to increase a refund. - */ -enum TALER_MERCHANTDB_RefundStatus -{ - - /** - * Refund amount exceeds legal exchange limits. - */ - TALER_MERCHANTDB_RS_LEGAL_FAILURE = -5, - - /** - * Refund amount currency does not match original payment. - */ - TALER_MERCHANTDB_RS_BAD_CURRENCY = -4, - - /** - * Refund amount exceeds original payment. - */ - TALER_MERCHANTDB_RS_TOO_HIGH = -3, - - /** - * Hard database failure. - */ - TALER_MERCHANTDB_RS_HARD_ERROR = -2, - - /** - * Soft database failure. - */ - TALER_MERCHANTDB_RS_SOFT_ERROR = -1, - - /** - * Order not found. - */ - TALER_MERCHANTDB_RS_NO_SUCH_ORDER = 0, - - /** - * Refund is now at or above the requested amount. - */ - TALER_MERCHANTDB_RS_SUCCESS = 1 - -}; - -/** - * Details about an OTP device. - */ -struct TALER_MERCHANTDB_OtpDeviceDetails -{ - - /** - * Description of the device. - */ - char *otp_description; - - /** - * Current usage counter value. - */ - uint64_t otp_ctr; - - /** - * Base64-encoded key. - */ - char *otp_key; - - /** - * Algorithm used to compute purchase confirmations. - */ - enum TALER_MerchantConfirmationAlgorithm otp_algorithm; -}; - - -/** - * Details about a template. - */ -struct TALER_MERCHANTDB_TemplateDetails -{ - /** - * Description of the template. - */ - char *template_description; - - /** - * In this template contract, we can have additional information. - */ - json_t *template_contract; - - /** - * ID of the OTP device linked to the template, or NULL. - */ - char *otp_id; - - /** - * Editable default values for fields not specified - * in the @e template_contract. NULL if the user - * cannot edit anything. - */ - json_t *editable_defaults; - -}; - - -/** - * Structure to hold Donau instance details from the database. - */ -struct TALER_MERCHANTDB_DonauInstance -{ - /** - * Donau instance serial - */ - uint64_t donau_instance_serial; - - /** - * The URL for the Donau instance. - */ - char *donau_url; - - /** - * The name of the charity associated with the Donau instance. - */ - char *charity_name; - - /** - * Pointer to the public key of the charity, used for cryptographic operations. - * This is represented as an EDDSA public key structure. - */ - struct DONAU_CharityPublicKeyP *charity_pub_key; - - /** - * A unique identifier for the charity in the Donau instance. - */ - uint64_t charity_id; - - /** - * The maximum allowable amount for donations to this charity in the current year. - * This is tracked for regulatory or internal business constraints. - */ - struct TALER_Amount charity_max_per_year; - - /** - * The total amount of donations received by the charity in the current year. - * This field helps track progress toward the yearly donation limit. - */ - struct TALER_Amount charity_receipts_to_date; - - /** - * The current year being tracked for donations. - * This is used to differentiate donation data between years. - */ - int64_t current_year; - - /** - * A JSON object containing key information specific to the Donau instance, - * such as cryptographic keys or other relevant details. - */ - json_t *donau_keys_json; -}; - - -/** - * Details about a product. - * - * FIXME: reuse TALER_MERCHANT_Product as a member in this structure! - */ -struct TALER_MERCHANTDB_ProductDetails -{ - /** - * Name of the product. - */ - char *product_name; - - /** - * Description of the product. - */ - char *description; - - /** - * Internationalized description. - */ - json_t *description_i18n; - - /** - * Unit in which the product is sold. - */ - char *unit; - - /** - * Optional list of per-unit prices. When NULL or empty, @e price - * must be used as the canonical single price. - */ - struct TALER_Amount *price_array; - - /** - * Number of entries in @e price_array. - */ - size_t price_array_length; - - /** - * Base64-encoded product image, or an empty string. - */ - char *image; - - /** - * Hash of the product image data, or NULL. - */ - char *image_hash; - - /** - * List of taxes the merchant pays for this product. Never NULL, - * but can be an empty array. - */ - json_t *taxes; - - /** - * Number of units of the product in stock in sum in total, including all - * existing sales and lost product, in product-specific units. UINT64_MAX - * indicates "infinite". - */ - uint64_t total_stock; - - /** - * Fractional part of stock in units of 1/1000000 of the base value. - */ - uint32_t total_stock_frac; - - /** - * Honor fractional stock if TRUE, else only integer stock. - */ - bool allow_fractional_quantity; - - /** - * Precision level (number of decimal places) to apply when - * fractional quantities are enabled. - */ - uint32_t fractional_precision_level; - - /** - * Number of units of the product in sold, in product-specific units. - */ - uint64_t total_sold; - - /** - * Fractional part of units sold in units of 1/1000000 of the base value. - */ - uint32_t total_sold_frac; - - /** - * Number of units of stock lost. - */ - uint64_t total_lost; - - /** - * Fractional part of lost units in units of 1/1000000 of the base value. - */ - uint32_t total_lost_frac; - - /** - * Identifies where the product is in stock, possibly an empty map. - */ - json_t *address; - - /** - * Identifies when the product will be restocked. 0 for unknown, - * #GNUNET_TIME_UNIT_FOREVER_ABS for never. - */ - struct GNUNET_TIME_Timestamp next_restock; - - /** - * Minimum required age for consumers buying this product. - * Default is 0. Only enforced of an exchange supports age - * restrictions. - */ - uint32_t minimum_age; - - /** - * Group in which the product is in. 0 for default group. - */ - uint64_t product_group_id; - - /** - * Money pot into which sales of this product should go into by default. - */ - uint64_t money_pot_id; - - /** - * True if the price for this product is given in net, - * False if its the gross price. - */ - bool price_is_net; - -}; - - -/** - * Details about a webhook. - */ -struct TALER_MERCHANTDB_WebhookDetails -{ - - /** - * event of the webhook. - */ - char *event_type; - - /** - * URL of the webhook. The customer will be redirected on this url. - */ - char *url; - - /** - * Http method used by the webhook. - */ - char *http_method; - - /** - * Header template of the webhook. - */ - char *header_template; - - /** - * Body template of the webhook. - */ - char *body_template; - -}; - - -/** - * Details about a product category. - */ -struct TALER_MERCHANTDB_CategoryDetails -{ - - /** - * Name of the category. - */ - char *category_name; - - /** - * Translations of the name of the category. - */ - json_t *category_name_i18n; - -}; - - -/** - * Details about the pending webhook. - */ -struct TALER_MERCHANTDB_PendingWebhookDetails -{ - - /** - * Identifies when we should make the next request to the webhook. 0 for unknown, - * #GNUNET_TIME_UNIT_FOREVER_ABS for never. - */ - struct GNUNET_TIME_Absolute next_attempt; - - /** - * How often have we tried this request so far. - */ - uint32_t retries; - - /** - * URL of the webhook. The customer will be redirected on this url. - */ - char *url; - - /** - * Http method used for the webhook. - */ - char *http_method; - - /** - * Header of the webhook. - */ - char *header; - - /** - * Body of the webhook. - */ - char *body; - -}; - - -/** - * Details about a token family. - */ -struct TALER_MERCHANTDB_TokenFamilyDetails -{ - /** - * Token family slug used for identification. - */ - char *slug; - - /** - * User readable name of the token family. - */ - char *name; - - /** - * Description of the token family. - */ - char *description; - - /** - * Internationalized token family description. - */ - json_t *description_i18n; - - /** - * Meta-data associated with the token family. - * Includes information like "trusted_domains" or - * "expected_domains", if set. - */ - json_t *extra_data; - - /** - * Cipher that should be used for this token family. Note: We do not expose - * this over the API and do not let clients set it. NULL for default (when - * calling database). - */ - char *cipher_spec; - - /** - * Start time of the token family duration. - */ - struct GNUNET_TIME_Timestamp valid_after; - - /** - * End time of the token family duration. - */ - struct GNUNET_TIME_Timestamp valid_before; - - /** - * Validity duration of the token family. Must be larger or - * equal to @a rounding plus @a start_offset_s. - */ - struct GNUNET_TIME_Relative duration; - - /** - * Rounding duration of the token family. - */ - struct GNUNET_TIME_Relative validity_granularity; - - /** - * Offset (in seconds) to subtract from the rounded - * validity start period. - */ - struct GNUNET_TIME_Relative start_offset; - - /** - * Token family kind. - */ - enum TALER_MERCHANTDB_TokenFamilyKind kind; - - /** - * Counter for each issued token of this family. - */ - uint64_t issued; - - /** - * Counter for each used token of this family. - */ - uint64_t used; -}; - - -/** - * Minimal product details for inventory templates. - */ -struct TALER_MERCHANTDB_InventoryProductDetails -{ - /** - * Name of the product. - */ - char *product_name; - - /** - * Description of the product. - */ - char *description; - - /** - * Internationalized description. - */ - json_t *description_i18n; - - /** - * Unit in which the product is sold. - */ - char *unit; - - /** - * List of per-unit prices. - */ - struct TALER_Amount *price_array; - - /** - * Number of entries in @e price_array. - */ - size_t price_array_length; - - /** - * Hash of the product image data, or NULL. - */ - char *image_hash; - - /** - * Honor fractional stock if TRUE, else only integer stock. - */ - bool allow_fractional_quantity; - - /** - * Precision level (number of decimal places) to apply when - * fractional quantities are enabled. - */ - uint32_t fractional_precision_level; - - /** - * Remaining units after sold/lost/locked deductions. - */ - uint64_t remaining_stock; - - /** - * Fractional part of remaining units in units of 1/1000000 of the base value. - */ - uint32_t remaining_stock_frac; - - /** - * List of taxes the merchant pays for this product. Never NULL, - * but can be an empty array. - */ - json_t *taxes; -}; - - -/** - * Details about an inventory measurement unit. - */ -struct TALER_MERCHANTDB_UnitDetails -{ - - /** - * Database serial. - */ - uint64_t unit_serial; - - /** - * Backend identifier used in product payloads. - */ - char *unit; - - /** - * Default long label (fallback string). - */ - char *unit_name_long; - - /** - * Default short label (fallback string). - */ - char *unit_name_short; - - /** - * Internationalised long labels. - */ - json_t *unit_name_long_i18n; - - /** - * Internationalised short labels. - */ - json_t *unit_name_short_i18n; - - /** - * Whether fractional quantities are enabled by default. - */ - bool unit_allow_fraction; - - /** - * Maximum number of fractional digits honoured by default. - */ - uint32_t unit_precision_level; - - /** - * Hidden from selectors when false. - */ - bool unit_active; - - /** - * Built-in units cannot be deleted. - */ - bool unit_builtin; -}; - - -/** - * Details about a wire account of the merchant. - */ -struct TALER_MERCHANTDB_AccountDetails -{ - /** - * Hash of the wire details (@e payto_uri and @e salt). - */ - struct TALER_MerchantWireHashP h_wire; - - /** - * Salt value used for hashing @e payto_uri. - */ - struct TALER_WireSaltP salt; - - /** - * Instance ID. Do not free (may be aliased with - * the instance ID given in the query!). - * FIXME: set in all functions involving this struct! - */ - const char *instance_id; - - /** - * Actual account address as a payto://-URI. - */ - struct TALER_FullPayto payto_uri; - - /** - * Where can the taler-merchant-wirewatch helper - * download information about incoming transfers? - * NULL if not available. - */ - char *credit_facade_url; - - /** - * JSON with credentials to use to access the - * @e credit_facade_url. - */ - json_t *credit_facade_credentials; - - /** - * Additional meta data to include in wire transfers to this - * account. Can be NULL if not used. - */ - char *extra_wire_subject_metadata; - - /** - * Is the account set for active use in new contracts? - */ - bool active; - -}; - - -/** - * Binary login token. Just a vanilla token made out - * of random bits. - */ -struct TALER_MERCHANTDB_LoginTokenP -{ - /** - * 32 bytes of entropy. - */ - uint64_t data[32 / 8]; -}; - -/** - * Authentication settings for an instance. - */ -struct TALER_MERCHANTDB_InstanceAuthSettings -{ - /** - * Hash used for authentication. All zero if authentication is off. - */ - struct TALER_MerchantAuthenticationHashP auth_hash; - - /** - * Salt used to hash the "Authentication" header, the result must then - * match the @e auth_hash. - */ - struct TALER_MerchantAuthenticationSaltP auth_salt; -}; - - -/** - * General settings for an instance. - */ -struct TALER_MERCHANTDB_InstanceSettings -{ - /** - * prefix for the instance under "/instances/" - */ - char *id; - - /** - * legal name of the instance - */ - char *name; - - /** - * merchant's site url - */ - char *website; - - /** - * email contact for password reset / possibly admin / customers - */ - char *email; - - /** - * phone contact for password reset / possibly admin / customers - */ - char *phone; - - /** - * merchant's logo data uri - */ - char *logo; - - /** - * Address of the business - */ - json_t *address; - - /** - * jurisdiction of the business - */ - json_t *jurisdiction; - - /** - * Use STEFAN curves to determine acceptable - * fees by default (otherwise: accept no fees by default). - */ - bool use_stefan; - - /** - * True of @e phone was validated. - */ - bool phone_validated; - - /** - * True of @e email was validated. - */ - bool email_validated; - - /** - * If the frontend does NOT specify an execution date, how long should - * we tell the exchange to wait to aggregate transactions before - * executing the wire transfer? This delay is added to the current - * time when we generate the advisory execution time for the exchange. - */ - struct GNUNET_TIME_Relative default_wire_transfer_delay; - - /** - * If the frontend does NOT specify a payment deadline, how long should - * offers we make be valid by default? - */ - struct GNUNET_TIME_Relative default_pay_delay; - - /** - * If the frontend does NOT specify a refund deadline, how long should - * refunds be possible? - */ - struct GNUNET_TIME_Relative default_refund_delay; - - /** - * How much should we round up the wire transfer deadline computed by - * adding the @e default_wire_transfer_delay to the refund deadline. - */ - enum GNUNET_TIME_RounderInterval default_wire_transfer_rounding_interval; - -}; - - -/** - * Free members of @a pd, but not @a pd itself. - * - * @param[in] pd product details to clean up - */ -void -TALER_MERCHANTDB_product_details_free ( - struct TALER_MERCHANTDB_ProductDetails *pd); - - -/** - * Free members of @a tp, but not @a tp itself. - * - * @param[in] tp template details to clean up - */ -void -TALER_MERCHANTDB_template_details_free ( - struct TALER_MERCHANTDB_TemplateDetails *tp); - - -/** - * Free members of @a wb, but not @a wb itself. - * - * @param[in] wb webhook details to clean up - */ -void -TALER_MERCHANTDB_webhook_details_free ( - struct TALER_MERCHANTDB_WebhookDetails *wb); - -/** - * Free members of @a pwb, but not @a pwb itself. - * - * @param[in] pwb pending webhook details to clean up - */ -void -TALER_MERCHANTDB_pending_webhook_details_free ( - struct TALER_MERCHANTDB_PendingWebhookDetails *pwb); - - -/** - * Free members of @a tf, but not @a tf itself. - * - * @param[in] tf token family details to clean up - */ -void -TALER_MERCHANTDB_token_family_details_free ( - struct TALER_MERCHANTDB_TokenFamilyDetails *tf); - - -/** - * Free members of @a cd, but not @a cd itself. - * - * @param[in] cd token family details to clean up - */ -void -TALER_MERCHANTDB_category_details_free ( - struct TALER_MERCHANTDB_CategoryDetails *cd); - -/** - * Free members of @a ud, but not @a ud itself. - * - * @param[in] ud unit details to clean up - */ -void -TALER_MERCHANTDB_unit_details_free ( - struct TALER_MERCHANTDB_UnitDetails *ud); - -#endif /* MERCHANT_DB_H */ - -/* end of taler_merchantdb_lib.h */ diff --git a/src/include/taler/taler_merchantdb_plugin.h b/src/include/taler/taler_merchantdb_plugin.h @@ -1,575 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014-2026 Taler Systems SA - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU Lesser General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING.GPL. If not, see <http://www.gnu.org/licenses/> -*/ -/** - * @file src/include/taler/taler_merchantdb_plugin.h - * @brief database access for the merchant - * @author Florian Dold - * @author Christian Grothoff - * @author Priscilla Huang - */ -#ifndef TALER_MERCHANTDB_PLUGIN_H -#define TALER_MERCHANTDB_PLUGIN_H - -#include <gnunet/gnunet_common.h> -#include <gnunet/gnunet_time_lib.h> -#include <gnunet/gnunet_util_lib.h> -#include <gnunet/gnunet_db_lib.h> -#include <taler/taler_merchant_util.h> -#include <taler/taler_exchange_service.h> -#include <jansson.h> -#include <donau/donau_service.h> -#include <donau/donau_util.h> - - -/** - * Typically called by `lookup_instances`. - * - * @param cls closure - * @param merchant_pub public key of the instance - * @param merchant_priv private key of the instance, NULL if not available - * @param is general instance settings - * @param ias instance authentication settings - */ -typedef void -(*TALER_MERCHANTDB_InstanceCallback)( - void *cls, - const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_MerchantPrivateKeyP *merchant_priv, - const struct TALER_MERCHANTDB_InstanceSettings *is, - const struct TALER_MERCHANTDB_InstanceAuthSettings *ias); - - -/** - * Callback invoked with information about a bank account. - * - * @param cls closure - * @param merchant_priv private key of the merchant instance - * @param ad details about the account - */ -typedef void -(*TALER_MERCHANTDB_AccountCallback)( - void *cls, - const struct TALER_MerchantPrivateKeyP *merchant_priv, - const struct TALER_MERCHANTDB_AccountDetails *ad); - - -/** - * Determines the maximum @a amount for a particular - * type of operation for a given @a exchange_url. - * - * @param cls closure - * @param exchange_url base URL of the exchange to get - * the limit for - * @param[in,out] amount lowered to the maximum amount - * allowed at the exchange - */ -typedef void -(*TALER_MERCHANTDB_OperationLimitCallback)( - void *cls, - const char *exchange_url, - struct TALER_Amount *amount); - - -/** - * Typically called by `lookup_products`. - * - * @param cls a `json_t *` JSON array to build - * @param product_serial row ID of the product - * @param product_id ID of the product - */ -typedef void -(*TALER_MERCHANTDB_ProductsCallback)( - void *cls, - uint64_t product_serial, - const char *product_id); - - -/** - * Typically called by `lookup_all_products`. - * - * @param cls a `json_t *` JSON array to build - * @param product_serial row ID of the product - * @param product_id ID of the product - * @param pd full product details - * @param num_categories length of @a categories array - * @param categories array of categories the - * product is in - */ -typedef void -(*TALER_MERCHANTDB_ProductCallback)( - void *cls, - uint64_t product_serial, - const char *product_id, - const struct TALER_MERCHANTDB_ProductDetails *pd, - size_t num_categories, - const uint64_t *categories); - -/** - * Typically called by `lookup_inventory_products`. - * - * @param cls a `json_t *` JSON array to build - * @param product_id ID of the product - * @param pd inventory product details - * @param num_categories length of @a categories array - * @param categories array of categories the - * product is in - */ -typedef void -(*TALER_MERCHANTDB_InventoryProductCallback)( - void *cls, - const char *product_id, - const struct TALER_MERCHANTDB_InventoryProductDetails *pd, - size_t num_categories, - const uint64_t *categories); - - -/** - * Callback function typically used by `select_donau_instances` to handle - * the details of each Donau instance retrieved from the database. - * - * @param cls Closure to pass additional context or data to the callback function. - * @param donau_url The URL of the Donau instance. - */ -typedef void -(*TALER_MERCHANTDB_DonauInstanceFilteredCallback)( - void *cls, - const char *donau_url - ); - -/** - * Callback function typically used by `select_donau_instances` to handle - * the details of each Donau instance retrieved from the database. - * - * @param cls Closure to pass additional context or data to the callback function. - * @param donau_instance_serial Serial number of the Donau instance in the merchant database. - * @param donau_url The URL of the Donau instance. - * @param charity_name The name of the charity associated with the Donau instance. - * @param charity_pub_key Pointer to the charity's public key used for cryptographic operations. - * @param charity_id The unique identifier for the charity within the Donau instance. - * @param charity_max_per_year Maximum allowed donations to the charity for the current year. - * @param charity_receipts_to_date Total donations received by the charity so far in the current year. - * @param current_year The year for which the donation data is being tracked. - * @param donau_keys_json JSON object containing additional key-related information for the Donau instance, NULL if not (yet) available. - */ -typedef void -(*TALER_MERCHANTDB_DonauInstanceCallback)( - void *cls, - uint64_t donau_instance_serial, - const char *donau_url, - const char *charity_name, - const struct DONAU_CharityPublicKeyP *charity_pub_key, - uint64_t charity_id, - const struct TALER_Amount *charity_max_per_year, - const struct TALER_Amount *charity_receipts_to_date, - int64_t current_year, - const json_t *donau_keys_json - ); - - -/** - * Typically called by `lookup_login_tokens`. - * - * @param cls a `json_t *` JSON array to build - * @param creation_time creation time of the token - * @param expiration_time expiration time of the token - * @param scope validity scope of the token - * @param description description of the token - * @param serial serial number of the token - */ -typedef void -(*TALER_MERCHANTDB_LoginTokensCallback)( - void *cls, - struct GNUNET_TIME_Timestamp creation_time, - struct GNUNET_TIME_Timestamp expiration_time, - uint32_t scope, - const char *description, - uint64_t serial); - - -/** - * Typically called by `lookup_templates`. - * - * @param cls closure - * @param template_id ID of the template - * @param template_description description of the template - */ -typedef void -(*TALER_MERCHANTDB_TemplatesCallback)( - void *cls, - const char *template_id, - const char *template_description); - - -/** - * Typically called by `lookup_otp_devices`. - * - * @param cls closure - * @param otp_id ID of the OTP device - * @param otp_description description of the OTP device - */ -typedef void -(*TALER_MERCHANTDB_OtpDeviceCallback)( - void *cls, - const char *otp_id, - const char *otp_description); - - -/** - * Typically called by `lookup_categories`. - * - * @param cls closure - * @param category_id ID of the category - * @param category_name name of the category - * @param category_name_i18n translations of the @a category_name - * @param product_count number of products in the category - */ -typedef void -(*TALER_MERCHANTDB_CategoriesCallback)( - void *cls, - uint64_t category_id, - const char *category_name, - const json_t *category_name_i18n, - uint64_t product_count); - - -/** - * Typically called by `lookup_units`. - * - * @param cls closure - * @param unit_serial database identifier - * @param ud measurement unit details (borrowed) - */ -typedef void -(*TALER_MERCHANTDB_UnitsCallback)( - void *cls, - uint64_t unit_serial, - const struct TALER_MERCHANTDB_UnitDetails *ud); - - -/** - * Typically called by `lookup_webhooks`. - * - * @param cls a `json_t *` JSON array to build - * @param webhook_id ID of the webhook - * @param event_type event of the webhook - */ -typedef void -(*TALER_MERCHANTDB_WebhooksCallback)( - void *cls, - const char *webhook_id, - const char *event_type); - - -/** - * Typically called by `lookup_webhook_by_event`. - * - * @param cls a `json_t *` JSON array to build - * @param webhook_serial reference to the configured webhook template. - * @param event_type which type of event triggers this type of webhook - * @param url the HTTP URL to make the webhook request to - * @param http_method HTTP method use for the webhook - * @param header_template template for the header of the webhook - * @param body_template template for the body of the webhook - */ -typedef void -(*TALER_MERCHANTDB_WebhookDetailCallback)( - void *cls, - uint64_t webhook_serial, - const char *event_type, - const char *url, - const char *http_method, - const char *header_template, - const char *body_template); - - -/** - * Typically called by `lookup_pending_webhooks`. - * - * @param cls a `json_t *` JSON array to build - * @param webhook_pending_serial reference to the configured webhook template. - * @param next_attempt is the time we should make the next request to the webhook. - * @param retries how often have we tried this request to the webhook. - * @param url to make request to - * @param http_method use for the webhook - * @param header of the webhook - * @param body of the webhook - */ -typedef void -(*TALER_MERCHANTDB_PendingWebhooksCallback)( - void *cls, - uint64_t webhook_pending_serial, - struct GNUNET_TIME_Absolute - next_attempt, - uint32_t retries, - const char *url, - const char *http_method, - const char *header, - const char *body); - - -/** - * Typically called by `select_order_blinded_sigs` - * - * @param cls closure - * @param hash hash of the token - * @param blinded_sig blinded signature for the token - */ -typedef void -(*TALER_MERCHANTDB_BlindedSigCallback)( - void *cls, - struct GNUNET_HashCode *hash, - struct GNUNET_CRYPTO_BlindedSignature *blinded_sig); - -/** - * Function called with information about a coin that was deposited. - * - * @param cls closure - * @param exchange_url exchange where @a coin_pub was deposited - * @param coin_pub public key of the coin - * @param amount_with_fee amount the exchange will deposit for this coin - * @param deposit_fee fee the exchange will charge for this coin - * @param refund_fee fee the exchange will charge for refunding this coin - */ -typedef void -(*TALER_MERCHANTDB_DepositsCallback)( - void *cls, - const char *exchange_url, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_Amount *amount_with_fee, - const struct TALER_Amount *deposit_fee, - const struct TALER_Amount *refund_fee); - - -/** - * Function called with information about a refund. - * - * @param cls closure - * @param coin_pub public coin from which the refund comes from - * @param refund_amount refund amount which is being taken from @a coin_pub - */ -typedef void -(*TALER_MERCHANTDB_RefundCallback)( - void *cls, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_Amount *refund_amount); - - -/** - * Typically called by `lookup_transfer_details_by_order`. - * - * @param cls closure - * @param wtid wire transfer subject of the wire transfer for the coin - * @param exchange_url base URL of the exchange that made the payment - * @param execution_time when was the payment made - * @param deposit_value contribution of the coin to the total wire transfer value - * @param deposit_fee deposit fee charged by the exchange for the coin - * @param transfer_confirmed did the merchant confirm that a wire transfer with - * @a wtid over the total amount happened? - * @param expected_credit_serial row of the expected wire transfer, usable - * as ``offset`` for the ``/private/incoming`` endpoint - */ -typedef void -(*TALER_MERCHANTDB_OrderTransferDetailsCallback)( - void *cls, - const struct TALER_WireTransferIdentifierRawP *wtid, - const char *exchange_url, - struct GNUNET_TIME_Timestamp execution_time, - const struct TALER_Amount *deposit_value, - const struct TALER_Amount *deposit_fee, - bool transfer_confirmed, - uint64_t expected_credit_serial); - - -/** - * Function called with detailed information about a refund. - * - * @param cls closure - * @param refund_serial unique serial number of the refund - * @param timestamp time of the refund (for grouping of refunds in the wallet UI) - * @param coin_pub public coin from which the refund comes from - * @param exchange_url URL of the exchange that issued @a coin_pub - * @param rtransaction_id identificator of the refund - * @param reason human-readable explanation of the refund - * @param refund_amount refund amount which is being taken from @a coin_pub - * @param pending true if the this refund was not yet processed by the wallet/exchange - */ -typedef void -(*TALER_MERCHANTDB_RefundDetailCallback)( - void *cls, - uint64_t refund_serial, - struct GNUNET_TIME_Timestamp timestamp, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - const char *exchange_url, - uint64_t rtransaction_id, - const char *reason, - const struct TALER_Amount *refund_amount, - bool pending); - - -/** - * Function called from ``account_kyc_get_status`` - * with KYC status information for this merchant. - * - * @param cls closure - * @param h_wire hash of the wire account - * @param payto_uri payto:// URI of the merchant's bank account - * @param exchange_url base URL of the exchange for which this is a status - * @param last_check when did we last get an update on our KYC status from the exchange - * @param kyc_ok true if we satisfied the KYC requirements - * @param access_token access token for the KYC SPA, NULL if we cannot access it yet (need KYC auth wire transfer) - * @param last_http_status last HTTP status from /kyc-check - * @param last_ec last Taler error code from /kyc-check - * @param in_aml_review true if the account is pending review - * @param jlimits JSON array of applicable AccountLimits, or NULL if unknown (like defaults apply) - */ -typedef void -(*TALER_MERCHANTDB_KycCallback)( - void *cls, - const struct TALER_MerchantWireHashP *h_wire, - struct TALER_FullPayto payto_uri, - const char *exchange_url, - struct GNUNET_TIME_Timestamp last_check, - bool kyc_ok, - const struct TALER_AccountAccessTokenP *access_token, - unsigned int last_http_status, - enum TALER_ErrorCode last_ec, - bool in_aml_review, - const json_t *jlimits); - - -/** - * Function called from ``account_kyc_get_outdated`` - * with information about outdated KYC status information. - * - * @param cls closure - * @param instance_id which instance is this about - * @param exchange_url base URL of the exchange for which the status is dated - * @param h_wire hash of the wire account for which the status is dated - */ -typedef void -(*TALER_MERCHANTDB_KycOutdatedCallback)( - void *cls, - const char *instance_id, - const char *exchange_url, - const struct TALER_MerchantWireHashP *h_wire); - - -/** - * Function called about the ``/keys`` status of every exchange - * we are working with. - * - * @param cls closure - * @param exchange_url base URL of the exchange - * @param next_download when will be the next download - * @param keys_expiration when does the current ``/keys`` response expire - * @param http_status last HTTP status from ``/keys`` - * @param ec last error code from fetching ``/keys`` - */ -typedef void -(*TALER_MERCHANTDB_ExchangesCallback)( - void *cls, - const char *exchange_url, - struct GNUNET_TIME_Absolute next_download, - struct GNUNET_TIME_Absolute keys_expiration, - unsigned int http_status, - enum TALER_ErrorCode ec); - - -/** - * Function called with information about a wire transfer identifier. - * - * @param cls closure - * @param order_id the order to which the deposits belong - * @param deposit_value the amount deposited under @a order_id - * @param deposit_fee the fee charged for @a deposit_value - */ -typedef void -(*TALER_MERCHANTDB_TransferSummaryCallback)( - void *cls, - const char *order_id, - const struct TALER_Amount *deposit_value, - const struct TALER_Amount *deposit_fee); - - -/** - * Function called with information about wire transfers - * that taler-merchant-exchange still needs to process. - * - * @param cls closure - * @param rowid row of the transfer in the merchant database - * @param instance_id instance that received the transfer - * @param exchange_url URL of the exchange that is making the deposit - * @param payto_uri account of the merchant that received the transfer - * @param wtid wire transfer subject identifying the aggregation - * @param next_attempt when should we next try to interact with the exchange - */ -typedef void -(*TALER_MERCHANTDB_OpenTransferCallback)( - void *cls, - uint64_t rowid, - const char *instance_id, - const char *exchange_url, - struct TALER_FullPayto payto_uri, - const struct TALER_WireTransferIdentifierRawP *wtid, - struct GNUNET_TIME_Absolute next_attempt); - - -/** - * Callback for results from `lookup_pending_deposits`. - * - * @param cls NULL - * @param deposit_serial identifies the deposit operation - * @param wire_deadline when is the wire due - * @param retry_time when to next try the exchange again - * @param h_contract_terms hash of the contract terms - * @param merchant_priv private key of the merchant - * @param instance_id name of the instance - * @param h_wire hash of the merchant's wire account into - * @param amount_with_fee amount the exchange will deposit for this coin - * @param deposit_fee fee the exchange will charge for this coin which the deposit was made - * @param coin_pub public key of the deposited coin - */ -typedef void -(*TALER_MERCHANTDB_PendingDepositsCallback) ( - void *cls, - uint64_t deposit_serial, - struct GNUNET_TIME_Absolute wire_deadline, - struct GNUNET_TIME_Absolute retry_time, - const struct TALER_PrivateContractHashP *h_contract_terms, - const struct TALER_MerchantPrivateKeyP *merchant_priv, - const char *instance_id, - const struct TALER_MerchantWireHashP *h_wire, - const struct TALER_Amount *amount_with_fee, - const struct TALER_Amount *deposit_fee, - const struct TALER_CoinSpendPublicKeyP *coin_pub); - - -/** - * Function called with detailed information about a wire transfer and - * the underlying deposits that are being aggregated. - * - * @param cls closure - * @param current_offset offset in the exchange reply we are at - * @param ttd details about the transfer at @a current_offset - */ -typedef void -(*TALER_MERCHANTDB_TransferDetailsCallback)( - void *cls, - unsigned int current_offset, - const struct TALER_TrackTransferDetails *ttd); - - -#endif diff --git a/src/lib/merchant_api_common.c b/src/lib/merchant_api_common.c @@ -20,7 +20,7 @@ * @author Christian Grothoff * @author Priscilla Huang */ -#include "taler/platform.h" +#include "platform.h" #include "microhttpd.h" #include <curl/curl.h> #include "taler/taler_merchant_service.h" diff --git a/src/lib/merchant_api_common_mfa_challenge.c b/src/lib/merchant_api_common_mfa_challenge.c @@ -19,7 +19,7 @@ * @brief Shared parsing of HTTP 202 MFA challenge responses * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_merchant_service.h" #include <gnunet/gnunet_json_lib.h> #include "merchant_api_common.h" diff --git a/src/lib/merchant_api_curl_defaults.c b/src/lib/merchant_api_curl_defaults.c @@ -19,7 +19,7 @@ * @brief curl easy handle defaults * @author Florian Dold */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_curl_lib.h> #include "merchant_api_curl_defaults.h" diff --git a/src/lib/merchant_api_curl_defaults.h b/src/lib/merchant_api_curl_defaults.h @@ -25,7 +25,7 @@ #define _TALER_CURL_DEFAULTS_H -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_curl_lib.h> diff --git a/src/lib/merchant_api_delete-management-instances-INSTANCE.c b/src/lib/merchant_api_delete-management-instances-INSTANCE.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /management/instances/$INSTANCE request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-accounts-H_WIRE.c b/src/lib/merchant_api_delete-private-accounts-H_WIRE.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/accounts/$H_WIRE request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-donau-DONAU_SERIAL.c b/src/lib/merchant_api_delete-private-donau-DONAU_SERIAL.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/donau/$DONAU_SERIAL request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-orders-ORDER_ID.c b/src/lib/merchant_api_delete-private-orders-ORDER_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/orders/$ORDER_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-otp-devices-DEVICE_ID.c b/src/lib/merchant_api_delete-private-otp-devices-DEVICE_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/otp-devices/$DEVICE_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-products-PRODUCT_ID.c b/src/lib/merchant_api_delete-private-products-PRODUCT_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/products/$PRODUCT_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-templates-TEMPLATE_ID.c b/src/lib/merchant_api_delete-private-templates-TEMPLATE_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/templates/$TEMPLATE_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-token.c b/src/lib/merchant_api_delete-private-token.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/token request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-tokens-SERIAL.c b/src/lib/merchant_api_delete-private-tokens-SERIAL.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/tokens/$SERIAL request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-transfers-TID.c b/src/lib/merchant_api_delete-private-transfers-TID.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/transfers/$TID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-units-UNIT.c b/src/lib/merchant_api_delete-private-units-UNIT.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/units/$UNIT request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_delete-private-webhooks-WEBHOOK_ID.c b/src/lib/merchant_api_delete-private-webhooks-WEBHOOK_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the DELETE /private/webhooks/$WEBHOOK_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-config.c b/src/lib/merchant_api_get-config.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /config request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-management-instances-INSTANCE.c b/src/lib/merchant_api_get-management-instances-INSTANCE.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /management/instances/$INSTANCE request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-management-instances.c b/src/lib/merchant_api_get-management-instances.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /management/instances request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-orders-ORDER_ID.c b/src/lib/merchant_api_get-orders-ORDER_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /orders/$ORDER_ID request (wallet-facing) * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-accounts-H_WIRE.c b/src/lib/merchant_api_get-private-accounts-H_WIRE.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/accounts/$H_WIRE request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-accounts.c b/src/lib/merchant_api_get-private-accounts.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/accounts request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-donau.c b/src/lib/merchant_api_get-private-donau.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/donau request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-kyc.c b/src/lib/merchant_api_get-private-kyc.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/kyc request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-orders-ORDER_ID.c b/src/lib/merchant_api_get-private-orders-ORDER_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/orders/$ORDER_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-orders.c b/src/lib/merchant_api_get-private-orders.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/orders request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-otp-devices-DEVICE_ID.c b/src/lib/merchant_api_get-private-otp-devices-DEVICE_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/otp-devices/$DEVICE_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-otp-devices.c b/src/lib/merchant_api_get-private-otp-devices.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/otp-devices request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-products-PRODUCT_ID.c b/src/lib/merchant_api_get-private-products-PRODUCT_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/products/$PRODUCT_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-products.c b/src/lib/merchant_api_get-private-products.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/products request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-statistics-amount-SLUG.c b/src/lib/merchant_api_get-private-statistics-amount-SLUG.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/statistics-amount/$SLUG request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-statistics-counter-SLUG.c b/src/lib/merchant_api_get-private-statistics-counter-SLUG.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/statistics-counter/$SLUG request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-templates-TEMPLATE_ID.c b/src/lib/merchant_api_get-private-templates-TEMPLATE_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/templates/$TEMPLATE_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-templates.c b/src/lib/merchant_api_get-private-templates.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/templates request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/lib/merchant_api_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/tokenfamilies/$TOKEN_FAMILY_SLUG request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-transfers.c b/src/lib/merchant_api_get-private-transfers.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/transfers request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-units-UNIT.c b/src/lib/merchant_api_get-private-units-UNIT.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/units/$UNIT request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-units.c b/src/lib/merchant_api_get-private-units.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/units request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-webhooks-WEBHOOK_ID.c b/src/lib/merchant_api_get-private-webhooks-WEBHOOK_ID.c @@ -20,7 +20,7 @@ * @author Priscilla Huang * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-private-webhooks.c b/src/lib/merchant_api_get-private-webhooks.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /private/webhooks request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-products-IMAGE_HASH-image.c b/src/lib/merchant_api_get-products-IMAGE_HASH-image.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /products/$IMAGE_HASH/image request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_get-templates-TEMPLATE_ID.c b/src/lib/merchant_api_get-templates-TEMPLATE_ID.c @@ -19,7 +19,7 @@ * @brief Implementation of the GET /templates/$TEMPLATE_ID request (wallet-facing) * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-management-instances-INSTANCE.c b/src/lib/merchant_api_patch-management-instances-INSTANCE.c @@ -21,7 +21,7 @@ * @brief Implementation of the PATCH /management/instances/$INSTANCE request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-private-accounts-H_WIRE.c b/src/lib/merchant_api_patch-private-accounts-H_WIRE.c @@ -21,7 +21,7 @@ * @brief Implementation of the PATCH /private/accounts/$H_WIRE request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-private-orders-ORDER_ID-forget.c b/src/lib/merchant_api_patch-private-orders-ORDER_ID-forget.c @@ -21,7 +21,7 @@ * @brief Implementation of the PATCH /private/orders/$ORDER_ID/forget request * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-private-otp-devices-DEVICE_ID.c b/src/lib/merchant_api_patch-private-otp-devices-DEVICE_ID.c @@ -21,7 +21,7 @@ * @brief Implementation of the PATCH /private/otp-devices/$DEVICE_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-private-products-PRODUCT_ID.c b/src/lib/merchant_api_patch-private-products-PRODUCT_ID.c @@ -21,7 +21,7 @@ * @brief Implementation of the PATCH /private/products/$PRODUCT_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-private-templates-TEMPLATE_ID.c b/src/lib/merchant_api_patch-private-templates-TEMPLATE_ID.c @@ -21,7 +21,7 @@ * @brief Implementation of the PATCH /private/templates/$TEMPLATE_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-private-units-UNIT.c b/src/lib/merchant_api_patch-private-units-UNIT.c @@ -18,7 +18,7 @@ * @brief Implementation of the PATCH /private/units/$UNIT request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_patch-private-webhooks-WEBHOOK_ID.c b/src/lib/merchant_api_patch-private-webhooks-WEBHOOK_ID.c @@ -21,7 +21,7 @@ * @brief Implementation of the PATCH /private/webhooks/$WEBHOOK_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-management-instances-INSTANCE-auth.c b/src/lib/merchant_api_post-management-instances-INSTANCE-auth.c @@ -19,7 +19,7 @@ * @brief Implementation of the POST /management/instances/$INSTANCE/auth request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-management-instances.c b/src/lib/merchant_api_post-management-instances.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /management/instances request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-orders-ORDER_ID-abort.c b/src/lib/merchant_api_post-orders-ORDER_ID-abort.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /orders/$ID/abort request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-orders-ORDER_ID-claim.c b/src/lib/merchant_api_post-orders-ORDER_ID-claim.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /orders/$ID/claim request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-orders-ORDER_ID-paid.c b/src/lib/merchant_api_post-orders-ORDER_ID-paid.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /orders/$ORDER_ID/paid request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-orders-ORDER_ID-pay.c b/src/lib/merchant_api_post-orders-ORDER_ID-pay.c @@ -22,7 +22,7 @@ * @author Christian Grothoff * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-orders-ORDER_ID-refund.c b/src/lib/merchant_api_post-orders-ORDER_ID-refund.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /orders/$ORDER_ID/refund request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-accounts.c b/src/lib/merchant_api_post-private-accounts.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/accounts request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-categories.c b/src/lib/merchant_api_post-private-categories.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/categories request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-donau.c b/src/lib/merchant_api_post-private-donau.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/donau request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-orders-ORDER_ID-refund.c b/src/lib/merchant_api_post-private-orders-ORDER_ID-refund.c @@ -19,7 +19,7 @@ * @brief Implementation of the POST /private/orders/$ORDER_ID/refund request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-orders.c b/src/lib/merchant_api_post-private-orders.c @@ -19,7 +19,7 @@ * @brief Implementation of the POST /private/orders request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-otp-devices.c b/src/lib/merchant_api_post-private-otp-devices.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/otp-devices request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-products-PRODUCT_ID-lock.c b/src/lib/merchant_api_post-private-products-PRODUCT_ID-lock.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/products/$PRODUCT_ID/lock request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-products.c b/src/lib/merchant_api_post-private-products.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/products request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-templates.c b/src/lib/merchant_api_post-private-templates.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/templates request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-token.c b/src/lib/merchant_api_post-private-token.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/token request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-tokenfamilies.c b/src/lib/merchant_api_post-private-tokenfamilies.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/tokenfamilies request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-transfers.c b/src/lib/merchant_api_post-private-transfers.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/transfers request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-units.c b/src/lib/merchant_api_post-private-units.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/units request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-private-webhooks.c b/src/lib/merchant_api_post-private-webhooks.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /private/webhooks request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/merchant_api_post-templates-TEMPLATE_ID.c b/src/lib/merchant_api_post-templates-TEMPLATE_ID.c @@ -21,7 +21,7 @@ * @brief Implementation of the POST /templates/$TEMPLATE_ID request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <curl/curl.h> #include <jansson.h> #include <microhttpd.h> /* just for HTTP status codes */ diff --git a/src/lib/test_merchant_api_common.c b/src/lib/test_merchant_api_common.c @@ -19,7 +19,7 @@ * @brief Unit test for test_merchant_api_common.c * @author Florian Dold */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_merchant_service.h" diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c @@ -22,7 +22,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_util.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_util.h" diff --git a/src/merchant-tools/taler-merchant-dbinit.c b/src/merchant-tools/taler-merchant-dbinit.c @@ -19,11 +19,11 @@ * @author Florian Dold * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_util.h> #include <gnunet/gnunet_util_lib.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/create_tables.h" #include "merchant-database/drop_tables.h" #include "merchant-database/gc.h" diff --git a/src/merchant-tools/taler-merchant-passwd.c b/src/merchant-tools/taler-merchant-passwd.c @@ -18,12 +18,12 @@ * @brief Reset access tokens for instances. * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_util.h> #include <taler/taler_dbevents.h> #include <gnunet/gnunet_util_lib.h> #include "taler/taler_merchant_util.h" -#include "taler/taler_merchantdb_lib.h" +#include "merchantdb_lib.h" #include "merchant-database/event_notify.h" #include "merchant-database/insert_instance.h" #include "merchant-database/update_instance_auth.h" diff --git a/src/merchant-tools/taler-merchant-setup-reserve.c b/src/merchant-tools/taler-merchant-setup-reserve.c @@ -18,7 +18,7 @@ * @brief Create reserve for tipping * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_util.h> #include <microhttpd.h> #include <gnunet/gnunet_util_lib.h> diff --git a/src/testing/test_kyc_api.c b/src/testing/test_kyc_api.c @@ -23,7 +23,7 @@ * @author Christian Grothoff * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_util.h> #include <taler/taler_signatures.h> #include <taler/taler_exchange_service.h> diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c @@ -23,7 +23,7 @@ * @author Christian Grothoff * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_time_lib.h> #include <taler/taler_util.h> #include <taler/taler_signatures.h> diff --git a/src/testing/test_merchant_api_twisted.c b/src/testing/test_merchant_api_twisted.c @@ -25,7 +25,7 @@ * @author Florian Dold <dold@taler.net> */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_util.h> #include <taler/taler_signatures.h> #include <taler/taler_exchange_service.h> diff --git a/src/testing/test_reconciliation.c b/src/testing/test_reconciliation.c @@ -23,7 +23,7 @@ * @author Christian Grothoff * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_time_lib.h> #include <taler/taler_util.h> #include <taler/taler_signatures.h> diff --git a/src/testing/testing_api_cmd_abort_order.c b/src/testing/testing_api_cmd_abort_order.c @@ -21,7 +21,7 @@ * @brief command to test the abort feature. * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include <taler/taler_signatures.h> diff --git a/src/testing/testing_api_cmd_checkserver.c b/src/testing/testing_api_cmd_checkserver.c @@ -22,7 +22,7 @@ * @brief Implement a CMD to run an Checkserver service for faking the legitimation service * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_json_lib.h" #include <gnunet/gnunet_curl_lib.h> #include "taler/taler_testing_lib.h" diff --git a/src/testing/testing_api_cmd_claim_order.c b/src/testing/testing_api_cmd_claim_order.c @@ -22,7 +22,7 @@ * @brief command to claim an order * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_config.c b/src/testing/testing_api_cmd_config.c @@ -23,7 +23,7 @@ * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_cmd_delete_account.c b/src/testing/testing_api_cmd_delete_account.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /account/$H_WIRE * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_delete_donau_instances.c b/src/testing/testing_api_cmd_delete_donau_instances.c @@ -20,7 +20,7 @@ * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_cmd_delete_instance.c b/src/testing/testing_api_cmd_delete_instance.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /instance/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_delete_order.c b/src/testing/testing_api_cmd_delete_order.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /orders/$ORDER_ID * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_delete_otp_device.c b/src/testing/testing_api_cmd_delete_otp_device.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /otp-devices/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_delete_product.c b/src/testing/testing_api_cmd_delete_product.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /product/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_delete_template.c b/src/testing/testing_api_cmd_delete_template.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /templates/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_delete_transfer.c b/src/testing/testing_api_cmd_delete_transfer.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /transfers/$TRANSFER_ID * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_delete_unit.c b/src/testing/testing_api_cmd_delete_unit.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /private/units/$ID * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_cmd_delete_webhook.c b/src/testing/testing_api_cmd_delete_webhook.c @@ -21,7 +21,7 @@ * @brief command to test DELETE /webhooks/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_depositcheck.c b/src/testing/testing_api_cmd_depositcheck.c @@ -22,7 +22,7 @@ * @author Priscilla HUANG * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_json_lib.h" #include <gnunet/gnunet_curl_lib.h> #include "taler/taler_signatures.h" diff --git a/src/testing/testing_api_cmd_exec_donaukeyupdate.c b/src/testing/testing_api_cmd_exec_donaukeyupdate.c @@ -21,7 +21,7 @@ * @brief run the taler-merchant-donaukeyupdate command * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_json_lib.h> #include <gnunet/gnunet_curl_lib.h> #include <taler/taler_signatures.h> diff --git a/src/testing/testing_api_cmd_forget_order.c b/src/testing/testing_api_cmd_forget_order.c @@ -22,7 +22,7 @@ * @brief command to forget fields of an order * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_donau_instances.c b/src/testing/testing_api_cmd_get_donau_instances.c @@ -22,7 +22,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_instance.c b/src/testing/testing_api_cmd_get_instance.c @@ -21,7 +21,7 @@ * @brief command to test GET /instance/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_instances.c b/src/testing/testing_api_cmd_get_instances.c @@ -21,7 +21,7 @@ * @brief command to test GET /instances * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_orders.c b/src/testing/testing_api_cmd_get_orders.c @@ -21,7 +21,7 @@ * @brief command to test GET /orders * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_otp_device.c b/src/testing/testing_api_cmd_get_otp_device.c @@ -21,7 +21,7 @@ * @brief command to test GET /otp-devices/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_otp_devices.c b/src/testing/testing_api_cmd_get_otp_devices.c @@ -21,7 +21,7 @@ * @brief command to test GET /otp-devices * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_product.c b/src/testing/testing_api_cmd_get_product.c @@ -21,7 +21,7 @@ * @brief command to test GET /product/$ID * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_product_image.c b/src/testing/testing_api_cmd_get_product_image.c @@ -21,7 +21,7 @@ * @brief command to test GET /products/$HASH/image * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_products.c b/src/testing/testing_api_cmd_get_products.c @@ -21,7 +21,7 @@ * @brief command to test GET /products * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_statisticsamount.c b/src/testing/testing_api_cmd_get_statisticsamount.c @@ -21,7 +21,7 @@ * @brief command to test GET /statistics-amount/$SLUG * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_statisticscounter.c b/src/testing/testing_api_cmd_get_statisticscounter.c @@ -21,7 +21,7 @@ * @brief command to test GET /statistics-counter/$SLUG * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_template.c b/src/testing/testing_api_cmd_get_template.c @@ -21,7 +21,7 @@ * @brief command to test GET /templates/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_templates.c b/src/testing/testing_api_cmd_get_templates.c @@ -21,7 +21,7 @@ * @brief command to test GET /templates * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_transfers.c b/src/testing/testing_api_cmd_get_transfers.c @@ -22,7 +22,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_unit.c b/src/testing/testing_api_cmd_get_unit.c @@ -21,7 +21,7 @@ * @brief command to test GET /private/units/$ID * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_units.c b/src/testing/testing_api_cmd_get_units.c @@ -21,7 +21,7 @@ * @brief command to test GET /private/units * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_webhook.c b/src/testing/testing_api_cmd_get_webhook.c @@ -21,7 +21,7 @@ * @brief command to test GET /webhooks/$ID * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_get_webhooks.c b/src/testing/testing_api_cmd_get_webhooks.c @@ -21,7 +21,7 @@ * @brief command to test GET /webhooks * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_instance_auth.c b/src/testing/testing_api_cmd_instance_auth.c @@ -21,7 +21,7 @@ * @brief command to test /private/auth POSTing * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_instance_token.c b/src/testing/testing_api_cmd_instance_token.c @@ -21,7 +21,7 @@ * @brief command to test /private/token POSTing * @author Martin Schanzenbach */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_kyc_get.c b/src/testing/testing_api_cmd_kyc_get.c @@ -21,7 +21,7 @@ * @brief command to test kyc_get request * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_lock_product.c b/src/testing/testing_api_cmd_lock_product.c @@ -21,7 +21,7 @@ * @brief command to test LOCK /product * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c @@ -21,7 +21,7 @@ * @brief command to test GET /private/orders/$ORDER_ID. * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_cmd_patch_instance.c b/src/testing/testing_api_cmd_patch_instance.c @@ -21,7 +21,7 @@ * @brief command to test PATCH /instance * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_patch_otp_device.c b/src/testing/testing_api_cmd_patch_otp_device.c @@ -21,7 +21,7 @@ * @brief command to test PATCH /otp-device * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_patch_product.c b/src/testing/testing_api_cmd_patch_product.c @@ -21,7 +21,7 @@ * @brief command to test PATCH /product * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_patch_template.c b/src/testing/testing_api_cmd_patch_template.c @@ -21,7 +21,7 @@ * @brief command to test PATCH /template * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_patch_unit.c b/src/testing/testing_api_cmd_patch_unit.c @@ -21,7 +21,7 @@ * @brief command to test PATCH /private/units/$ID * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_cmd_patch_webhook.c b/src/testing/testing_api_cmd_patch_webhook.c @@ -21,7 +21,7 @@ * @brief command to test PATCH /webhook * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_pay_order.c b/src/testing/testing_api_cmd_pay_order.c @@ -22,7 +22,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_json_lib.h> #include <gnunet/gnunet_time_lib.h> diff --git a/src/testing/testing_api_cmd_post_account.c b/src/testing/testing_api_cmd_post_account.c @@ -21,7 +21,7 @@ * @brief command to test POST /account * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_categories.c b/src/testing/testing_api_cmd_post_categories.c @@ -18,7 +18,7 @@ * @brief command to test POST /private/categories * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <jansson.h> #include <microhttpd.h> #include <taler/taler_testing_lib.h> diff --git a/src/testing/testing_api_cmd_post_donau_charity_merchant.c b/src/testing/testing_api_cmd_post_donau_charity_merchant.c @@ -22,7 +22,7 @@ * @author Bohdan Potuzhnyi * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include <taler/taler_signatures.h> diff --git a/src/testing/testing_api_cmd_post_donau_instances.c b/src/testing/testing_api_cmd_post_donau_instances.c @@ -23,7 +23,7 @@ * @author Vlada Svirsh */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_instances.c b/src/testing/testing_api_cmd_post_instances.c @@ -21,7 +21,7 @@ * @brief command to test POST /instances * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c @@ -23,7 +23,7 @@ * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_time_lib.h> #include <jansson.h> diff --git a/src/testing/testing_api_cmd_post_orders_paid.c b/src/testing/testing_api_cmd_post_orders_paid.c @@ -21,7 +21,7 @@ * @brief command to test POST /orders/$ID/paid. * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_otp_devices.c b/src/testing/testing_api_cmd_post_otp_devices.c @@ -21,7 +21,7 @@ * @brief command to test POST /otp-devices * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_products.c b/src/testing/testing_api_cmd_post_products.c @@ -21,7 +21,7 @@ * @brief command to test POST /products * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_cmd_post_templates.c b/src/testing/testing_api_cmd_post_templates.c @@ -21,7 +21,7 @@ * @brief command to test POST /templates * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_tokenfamilies.c b/src/testing/testing_api_cmd_post_tokenfamilies.c @@ -22,7 +22,7 @@ * @brief command to run POST /tokenfamilies * @author Christian Blättler */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_time_lib.h> #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> diff --git a/src/testing/testing_api_cmd_post_transfers.c b/src/testing/testing_api_cmd_post_transfers.c @@ -21,7 +21,7 @@ * @brief command to test POST /transfers * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_units.c b/src/testing/testing_api_cmd_post_units.c @@ -21,7 +21,7 @@ * @brief command to test POST /private/units * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_cmd_post_using_templates.c b/src/testing/testing_api_cmd_post_using_templates.c @@ -21,7 +21,7 @@ * @brief command to test POST /using-templates * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_post_webhooks.c b/src/testing/testing_api_cmd_post_webhooks.c @@ -21,7 +21,7 @@ * @brief command to test POST /webhooks * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_refund_order.c b/src/testing/testing_api_cmd_refund_order.c @@ -22,7 +22,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_testserver.c b/src/testing/testing_api_cmd_testserver.c @@ -22,7 +22,7 @@ * @brief Implement a CMD to run an Testserver service for faking the legitimation service * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_json_lib.h" #include <gnunet/gnunet_curl_lib.h> #include "taler/taler_testing_lib.h" diff --git a/src/testing/testing_api_cmd_tme.c b/src/testing/testing_api_cmd_tme.c @@ -21,7 +21,7 @@ * @brief run the taler-merchant-reconciliation command * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_json_lib.h" #include <gnunet/gnunet_curl_lib.h> #include "taler/taler_signatures.h" diff --git a/src/testing/testing_api_cmd_wallet_get_order.c b/src/testing/testing_api_cmd_wallet_get_order.c @@ -21,7 +21,7 @@ * @brief command to test GET /order/$ORDER_ID * @author Jonathan Buchanan */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_wallet_get_template.c b/src/testing/testing_api_cmd_wallet_get_template.c @@ -18,7 +18,7 @@ * @brief command to test GET /templates/$ID (wallet) * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <microhttpd.h> #include <jansson.h> #include <taler/taler_testing_lib.h> diff --git a/src/testing/testing_api_cmd_wallet_post_orders_refund.c b/src/testing/testing_api_cmd_wallet_post_orders_refund.c @@ -22,7 +22,7 @@ * @author Marcello Stanisci * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_service.h" diff --git a/src/testing/testing_api_cmd_webhook.c b/src/testing/testing_api_cmd_webhook.c @@ -21,7 +21,7 @@ * @brief run the taler-merchant-webhook command * @author Priscilla HUANG */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_json_lib.h" #include <gnunet/gnunet_curl_lib.h> #include "taler/taler_signatures.h" diff --git a/src/testing/testing_api_helpers.c b/src/testing/testing_api_helpers.c @@ -22,7 +22,7 @@ * @brief helper functions for test library. * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <taler/taler_exchange_service.h> #include <taler/taler_testing_lib.h> #include "taler/taler_merchant_testing_lib.h" diff --git a/src/testing/testing_api_traits.c b/src/testing/testing_api_traits.c @@ -22,7 +22,7 @@ * @author Christian Grothoff * @author Marcello Stanisci */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_merchant_testing_lib.h" diff --git a/src/util/amount_quantity.c b/src/util/amount_quantity.c @@ -18,7 +18,7 @@ * @brief Parsing quantities and other decimal fractions * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_db_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/util/contract_parse.c b/src/util/contract_parse.c @@ -19,7 +19,7 @@ * @author Iván Ávalos * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_json_lib.h> #include <jansson.h> diff --git a/src/util/contract_serialize.c b/src/util/contract_serialize.c @@ -20,7 +20,7 @@ * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_json_lib.h> #include <gnunet/gnunet_common.h> #include <taler/taler_json_lib.h> diff --git a/src/util/json.c b/src/util/json.c @@ -18,7 +18,7 @@ * @brief helper functions to parse JSON * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_json_lib.h> #include <jansson.h> diff --git a/src/util/mfa.c b/src/util/mfa.c @@ -18,7 +18,7 @@ * @brief helper functions for MFA processing * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_json_lib.h> #include <taler/taler_util.h> diff --git a/src/util/os_installation.c b/src/util/os_installation.c @@ -23,7 +23,7 @@ * @brief initialize libgnunet OS subsystem for taler-merchant. * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include "taler/taler_merchant_util.h" diff --git a/src/util/taler-merchant-config.c b/src/util/taler-merchant-config.c @@ -23,7 +23,7 @@ * @brief tool to access and manipulate Taler merchant configuration files * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include "taler/taler_merchant_util.h" diff --git a/src/util/template_parse.c b/src/util/template_parse.c @@ -18,7 +18,7 @@ * @brief shared logic for template contract parsing * @author Bohdan Potuzhnyi */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_json_lib.h> #include <jansson.h> diff --git a/src/util/test_contract.c b/src/util/test_contract.c @@ -20,7 +20,7 @@ * @author Iván Ávalos (ivan@avalos.me) */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_common.h> #include <gnunet/gnunet_json_lib.h> diff --git a/src/util/test_validators.c b/src/util/test_validators.c @@ -19,7 +19,7 @@ * @brief Tests for validators. * @author Christian Grothoff (ivan@avalos.me) */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include "taler/taler_merchant_util.h" diff --git a/src/util/validators.c b/src/util/validators.c @@ -18,7 +18,7 @@ * @brief Input validators * @author Christian Grothoff */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_db_lib.h> #include <taler/taler_json_lib.h> diff --git a/src/util/value_kinds.c b/src/util/value_kinds.c @@ -19,7 +19,7 @@ * @author Christian Grothoff * @author Bohdan */ -#include "taler/platform.h" +#include "platform.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_db_lib.h> #include <taler/taler_json_lib.h>