commit 939058c634a4b99069db5b86c6e88af3a81c1c8c parent 90c9a223b539ca534d501dfc26cc5f0debbd239a Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch> Date: Sun, 14 Jan 2024 22:02:07 +0100 Merge branch 'master' of ssh://git.taler.net/donau Diffstat:
85 files changed, 223 insertions(+), 216 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -13,6 +13,6 @@ src/include/donau_signatures.h src/donau-tools/taler-donau-dbinit src/donau/donau-httpd src/util/donau-config -src/testing/test_donau_api_home/.local/ +src/testing/test_donau_api_home/ src/donau-tools/donau-dbinit -vgcore.* -\ No newline at end of file +vgcore.* diff --git a/src/donau-tools/donau-dbinit.c b/src/donau-tools/donau-dbinit.c @@ -19,7 +19,7 @@ * @author Florian Dold * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include "donaudb_lib.h" #include "donau_util.h" diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c @@ -20,15 +20,15 @@ * @author Benedikt Mueller * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include <jansson.h> #include <microhttpd.h> #include <sched.h> #include <sys/resource.h> #include <limits.h> -// #include "taler/taler_templating_lib.h" -#include "taler/taler_mhd_lib.h" +// #include <taler/taler_templating_lib.h> +#include <taler/taler_mhd_lib.h> #include "donaudb_lib.h" #include "donau_util.h" #include "donau-httpd_config.h" diff --git a/src/donau/donau-httpd.h b/src/donau/donau-httpd.h @@ -24,7 +24,7 @@ #define DONAU_HTTPD_H #include <microhttpd.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include <taler/taler_util.h> #include <gnunet/gnunet_mhd_compat.h> diff --git a/src/donau/donau-httpd_config.c b/src/donau/donau-httpd_config.c @@ -18,12 +18,12 @@ * @brief Handle /config requests * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_json_lib.h> -#include "taler/taler_dbevents.h" +#include <taler/taler_dbevents.h> #include "donau-httpd_config.h" -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> #include <jansson.h> diff --git a/src/donau/donau-httpd_db.c b/src/donau/donau-httpd_db.c @@ -18,12 +18,12 @@ * @brief Generic database operations for the donau. * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <pthread.h> #include <jansson.h> #include <gnunet/gnunet_json_lib.h> -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> #include "donaudb_lib.h" #include "donau-httpd_db.h" // #include "donau-httpd_responses.h" diff --git a/src/donau/donau-httpd_get-charities.c b/src/donau/donau-httpd_get-charities.c @@ -18,17 +18,17 @@ * @brief Return charities * @author Johannes Casaburi */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include <jansson.h> #include <microhttpd.h> -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" -#include "taler/taler_signatures.h" +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> +#include <taler/taler_signatures.h> #include "donau-httpd.h" #include "donaudb_plugin.h" #include "donau-httpd_charity.h" -// #include "taler-exchange-httpd_metrics.h" +// #include <taler-exchange-httpd_metrics.h> /** diff --git a/src/donau/donau-httpd_get-charity.c b/src/donau/donau-httpd_get-charity.c @@ -18,14 +18,14 @@ * @brief Return summary information about AML decision * @author Johannes Casaburi */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include <jansson.h> #include <microhttpd.h> #include <pthread.h> -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" -#include "taler/taler_signatures.h" +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> +#include <taler/taler_signatures.h> #include "donaudb_plugin.h" #include "donau-httpd_charity.h" // #include "donau-httpd.h" diff --git a/src/donau/donau-httpd_keys.c b/src/donau/donau-httpd_keys.c @@ -19,9 +19,9 @@ * @author Christian Grothoff * @author Özgür Kesim */ -#include "taler/platform.h" -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" +#include <taler/platform.h> +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> #include "donau-httpd.h" #include "donau-httpd_keys.h" #include "donau-httpd_config.h" diff --git a/src/donau/donau-httpd_keys.h b/src/donau/donau-httpd_keys.h @@ -18,9 +18,9 @@ * @brief management of our various keys * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" +#include <taler/platform.h> +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> // #include "donau-httpd_responses.h" #include "donau_util.h" #include "donaudb_plugin.h" diff --git a/src/donau/donau-httpd_metrics.c b/src/donau/donau-httpd_metrics.c @@ -18,14 +18,14 @@ * @brief Handle /metrics requests * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_json_lib.h> -#include "taler/taler_dbevents.h" +#include <taler/taler_dbevents.h> // #include "donau-httpd_responses.h" #include "donau-httpd_keys.h" #include "donau-httpd_metrics.h" -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> #include <jansson.h> diff --git a/src/donau/donau-httpd_mhd.c b/src/donau/donau-httpd_mhd.c @@ -23,12 +23,12 @@ * @author Benedikt Mueller * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include <jansson.h> #include <microhttpd.h> #include <pthread.h> -#include "taler/taler_mhd_lib.h" +#include <taler/taler_mhd_lib.h> #include "donau-httpd_responses.h" #include "donau-httpd.h" #include "donau-httpd_mhd.h" diff --git a/src/donau/donau-httpd_post-charity.c b/src/donau/donau-httpd_post-charity.c @@ -18,15 +18,15 @@ * @brief Handle request to insert a charity. * @author Johannes Casaburi */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_json_lib.h> #include <jansson.h> #include <microhttpd.h> #include <pthread.h> -#include "taler/taler_json_lib.h" -#include "taler/taler_mhd_lib.h" -#include "taler/taler_signatures.h" +#include <taler/taler_json_lib.h> +#include <taler/taler_mhd_lib.h> +#include <taler/taler_signatures.h> #include "donaudb_plugin.h" #include "donau-httpd_charity.h" #include "donau-httpd_db.h" diff --git a/src/donau/donau-httpd_terms.c b/src/donau/donau-httpd_terms.c @@ -18,12 +18,12 @@ * @brief Handle /terms requests to return the terms of service * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_json_lib.h> #include <jansson.h> #include <microhttpd.h> -#include "taler/taler_mhd_lib.h" +#include <taler/taler_mhd_lib.h> #include "donau-httpd_terms.h" // #include "donau-httpd_responses.h" diff --git a/src/donau/donau-httpd_terms.h b/src/donau/donau-httpd_terms.h @@ -20,12 +20,12 @@ */ #ifndef DONAU_HTTPD_TERMS_H #define DONAU_HTTPD_TERMS_H -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_json_lib.h> #include <jansson.h> #include <microhttpd.h> -#include "taler/taler_mhd_lib.h" +#include <taler/taler_mhd_lib.h> #include "donau-httpd.h" // #include "donau-httpd_responses.h" diff --git a/src/donaudb/donaudb_plugin.c b/src/donaudb/donaudb_plugin.c @@ -18,7 +18,7 @@ * @brief Logic to load database plugin * @author Johannes Casaburi */ -#include "taler/platform.h" +#include <taler/platform.h> #include "donaudb_plugin.h" #include <ltdl.h> diff --git a/src/donaudb/pg_add_donation_unit_key.c b/src/donaudb/pg_add_donation_unit_key.c @@ -18,10 +18,10 @@ * @brief Implementation of the add_donation_unit_key function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_add_donation_unit_key.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_add_donation_unit_key.h b/src/donaudb/pg_add_donation_unit_key.h @@ -22,7 +22,7 @@ #define PG_ADD_DONATION_UNIT_KEY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_commit.c b/src/donaudb/pg_commit.c @@ -18,10 +18,10 @@ * @brief Implementation of the commit function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_commit.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_commit.h b/src/donaudb/pg_commit.h @@ -22,7 +22,7 @@ #define PG_COMMIT_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_create_tables.c b/src/donaudb/pg_create_tables.c @@ -18,10 +18,10 @@ * @brief Implementation of the create_tables function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_create_tables.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_create_tables.h b/src/donaudb/pg_create_tables.h @@ -22,7 +22,7 @@ #define PG_CREATE_TABLES_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_drop_tables.c b/src/donaudb/pg_drop_tables.c @@ -18,10 +18,10 @@ * @brief Implementation of the drop_tables function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_drop_tables.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_drop_tables.h b/src/donaudb/pg_drop_tables.h @@ -22,7 +22,7 @@ #define PG_DROP_TABLES_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_event_listen.c b/src/donaudb/pg_event_listen.c @@ -18,10 +18,10 @@ * @brief Implementation of the event_listen function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_event_listen.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_event_listen.h b/src/donaudb/pg_event_listen.h @@ -22,7 +22,7 @@ #define PG_EVENT_LISTEN_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** * Register callback to be invoked on events of type @a es. diff --git a/src/donaudb/pg_event_listen_cancel.c b/src/donaudb/pg_event_listen_cancel.c @@ -18,10 +18,10 @@ * @brief Implementation of the event_listen_cancel function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_event_listen_cancel.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_event_listen_cancel.h b/src/donaudb/pg_event_listen_cancel.h @@ -22,7 +22,7 @@ #define PG_EVENT_LISTEN_CANCEL_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_event_notify.c b/src/donaudb/pg_event_notify.c @@ -18,10 +18,10 @@ * @brief Implementation of the event_notify function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_event_notify.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_event_notify.h b/src/donaudb/pg_event_notify.h @@ -22,7 +22,7 @@ #define PG_EVENT_NOTIFY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_get_charities.c b/src/donaudb/pg_get_charities.c @@ -18,10 +18,10 @@ * @brief Implementation of the lookup_donation_unit_key function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_get_charities.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_get_donation_units.c b/src/donaudb/pg_get_donation_units.c @@ -18,10 +18,10 @@ * @brief Implementation of the get_donation_units function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_get_donation_units.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_get_donation_units.h b/src/donaudb/pg_get_donation_units.h @@ -22,7 +22,7 @@ #define PG_LOOKUP_DONATION_UNIT_KEY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** * Lookup information about current donation unit key. diff --git a/src/donaudb/pg_insert_charity.c b/src/donaudb/pg_insert_charity.c @@ -18,10 +18,10 @@ * @brief Implementation of the insert_charity function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_insert_charity.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_insert_charity.h b/src/donaudb/pg_insert_charity.h @@ -22,7 +22,7 @@ #define PG_INSERT_CHARITY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_insert_history_entry.c b/src/donaudb/pg_insert_history_entry.c @@ -18,10 +18,10 @@ * @brief Implementation of the insert_history_entry function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_insert_history_entry.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_insert_history_entry.h b/src/donaudb/pg_insert_history_entry.h @@ -22,7 +22,7 @@ #define PG_INSERT_HISTORY_ENTRY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_insert_issued_receipt.c b/src/donaudb/pg_insert_issued_receipt.c @@ -18,10 +18,10 @@ * @brief Implementation of the insert_issued_receipt function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_insert_issued_receipt.h" #include "pg_helper.h" #include "donau_service.h" diff --git a/src/donaudb/pg_insert_issued_receipt.h b/src/donaudb/pg_insert_issued_receipt.h @@ -22,7 +22,7 @@ #define PG_INSERT_ISSUED_RECEIPT_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_insert_signing_key.c b/src/donaudb/pg_insert_signing_key.c @@ -18,10 +18,10 @@ * @brief Implementation of the insert_signing_key function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_insert_signing_key.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_insert_signing_key.h b/src/donaudb/pg_insert_signing_key.h @@ -22,7 +22,7 @@ #define PG_INSERT_SIGNING_KEY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_insert_submitted_receipt.c b/src/donaudb/pg_insert_submitted_receipt.c @@ -18,10 +18,10 @@ * @brief Implementation of the insert_submitted_receipt function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_insert_submitted_receipt.h" #include "pg_helper.h" #include "donau_service.h" diff --git a/src/donaudb/pg_insert_submitted_receipt.h b/src/donaudb/pg_insert_submitted_receipt.h @@ -22,7 +22,7 @@ #define PG_INSERT_SUBMITTED_RECEIPT_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" #include "donau_service.h" diff --git a/src/donaudb/pg_lookup_charity.c b/src/donaudb/pg_lookup_charity.c @@ -18,10 +18,10 @@ * @brief Implementation of the lookup_donation_unit_key function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_lookup_charity.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_lookup_charity.h b/src/donaudb/pg_lookup_charity.h @@ -22,7 +22,7 @@ #define PG_GET_DONATION_UNIT_INFO_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** * Fetch information about a donation unit key. diff --git a/src/donaudb/pg_lookup_donation_unit.c b/src/donaudb/pg_lookup_donation_unit.c @@ -18,10 +18,10 @@ * @brief Implementation of the lookup_donation_unit function for Postgres * @author Johannes Casaburi */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_lookup_donation_unit.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_lookup_donation_unit.h b/src/donaudb/pg_lookup_donation_unit.h @@ -22,7 +22,7 @@ #define PG_LOOKUP_DONATION_UNIT_KEY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** * Lookup information about current donation unit key. diff --git a/src/donaudb/pg_lookup_signing_key.c b/src/donaudb/pg_lookup_signing_key.c @@ -18,10 +18,10 @@ * @brief Implementation of the lookup_signing_key function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_lookup_signing_key.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_lookup_signing_key.h b/src/donaudb/pg_lookup_signing_key.h @@ -22,7 +22,7 @@ #define PG_LOOKUP_SIGNING_KEY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_preflight.c b/src/donaudb/pg_preflight.c @@ -18,10 +18,10 @@ * @brief Implementation of the preflight function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_preflight.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_preflight.h b/src/donaudb/pg_preflight.h @@ -22,7 +22,7 @@ #define PG_PREFLIGTH_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_rollback.c b/src/donaudb/pg_rollback.c @@ -18,10 +18,10 @@ * @brief Implementation of the rollback function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_rollback.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_rollback.h b/src/donaudb/pg_rollback.h @@ -22,7 +22,7 @@ #define PG_ROLLBACK_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_start.c b/src/donaudb/pg_start.c @@ -18,10 +18,10 @@ * @brief Implementation of the start function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_preflight.h" #include "pg_start.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_start.h b/src/donaudb/pg_start.h @@ -22,7 +22,7 @@ #define PG_START_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_start_read_committed.c b/src/donaudb/pg_start_read_committed.c @@ -18,10 +18,10 @@ * @brief Implementation of the start_read_committed function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_start_read_committed.h" #include "pg_preflight.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_start_read_committed.h b/src/donaudb/pg_start_read_committed.h @@ -22,7 +22,7 @@ #define PG_START_READ_COMMITTED_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** * Start a READ COMMITTED transaction. diff --git a/src/donaudb/pg_start_read_only.c b/src/donaudb/pg_start_read_only.c @@ -18,10 +18,10 @@ * @brief Implementation of the start_read_only function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_start_read_only.h" #include "pg_preflight.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_start_read_only.h b/src/donaudb/pg_start_read_only.h @@ -22,7 +22,7 @@ #define PG_START_READ_ONLY_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_template.c b/src/donaudb/pg_template.c @@ -18,9 +18,9 @@ * @brief Implementation of the template function for Postgres * @author Christian Grothoff */ -#include "taler/platform.h" -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" +#include <taler/platform.h> +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> #include "pg_template.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_template.h b/src/donaudb/pg_template.h @@ -22,7 +22,7 @@ #define PG_TEMPLATE_H #include <taler/taler_util.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" diff --git a/src/donaudb/plugin_donaudb_postgres.c b/src/donaudb/plugin_donaudb_postgres.c @@ -19,15 +19,15 @@ * @brief Low-level (statement-level) Postgres database access for the donau * @author Johannes Casaburi */ -#include "taler/platform.h" +#include <taler/platform.h> #include <poll.h> #include <pthread.h> #include <libpq-fe.h> -#include "taler/taler_error_codes.h" -#include "taler/taler_dbevents.h" -#include "taler/taler_pq_lib.h" -#include "taler/taler_util.h" -#include "taler/taler_json_lib.h" +#include <taler/taler_error_codes.h> +#include <taler/taler_dbevents.h> +#include <taler/taler_pq_lib.h> +#include <taler/taler_util.h> +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" #include "pg_helper.h" #include "pg_preflight.h" diff --git a/src/donaudb/test_donaudb.c b/src/donaudb/test_donaudb.c @@ -20,9 +20,9 @@ * @author Christian Grothoff * @author Marcello Stanisci */ -#include "taler/platform.h" +#include <taler/platform.h> #include "donaudb_lib.h" -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donaudb_plugin.h" /** diff --git a/src/include/donau_crypto_lib.h b/src/include/donau_crypto_lib.h @@ -30,8 +30,8 @@ #define DONAU_CRYPTO_LIB_H #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_error_codes.h" -#include "taler/taler_util.h" +#include <taler/taler_error_codes.h> +#include <taler/taler_util.h> #include <gcrypt.h> #include <jansson.h> diff --git a/src/include/donau_json_lib.h b/src/include/donau_json_lib.h @@ -25,10 +25,10 @@ #include <gnunet/gnunet_json_lib.h> #include <gnunet/gnunet_curl_lib.h> #include <gnunet/gnunet_json_lib.h> -#include "taler/taler_util.h" -#include "taler/taler_error_codes.h" +#include <taler/taler_util.h> +#include <taler/taler_error_codes.h> #include "donau_util.h" -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> /** * Generate a parser specification for a donation unit public key of a given diff --git a/src/include/donau_service.h b/src/include/donau_service.h @@ -27,7 +27,7 @@ #include <jansson.h> #include <taler/taler_util.h> #include "donau_util.h" -#include "taler/taler_error_codes.h" +#include <taler/taler_error_codes.h> #include <gnunet/gnunet_curl_lib.h> diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h @@ -22,7 +22,7 @@ #define DONAUDB_PLUGIN_H // #include <jansson.h> #include <gnunet/gnunet_db_lib.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donau_signatures.h" #include "donau_util.h" diff --git a/src/json/donau_json.c b/src/json/donau_json.c @@ -18,10 +18,10 @@ * @brief helper functions for JSON processing using libjansson * @author Lukas Matyja */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_util.h" -#include "taler/taler_json_lib.h" +#include <taler/taler_util.h> +#include <taler/taler_json_lib.h> #include <unistr.h> #include "donau_json_lib.h" # diff --git a/src/json/json.c b/src/json/json.c @@ -19,10 +19,10 @@ * @author Sree Harsha Totakura <sreeharsha@totakura.in> * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_util.h" -#include "taler/taler_json_lib.h" +#include <taler/taler_util.h> +#include <taler/taler_json_lib.h> #include <unistr.h> diff --git a/src/json/json_helper.c b/src/json/json_helper.c @@ -20,10 +20,10 @@ * @author Sree Harsha Totakura <sreeharsha@totakura.in> * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_util.h" -#include "taler/taler_json_lib.h" +#include <taler/taler_util.h> +#include <taler/taler_json_lib.h> /** diff --git a/src/json/json_pack.c b/src/json/json_pack.c @@ -18,10 +18,10 @@ * @brief helper functions for JSON object packing * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_util.h" -#include "taler/taler_json_lib.h" +#include <taler/taler_util.h> +#include <taler/taler_json_lib.h> struct GNUNET_JSON_PackSpec diff --git a/src/lib/donau_api_charity_get.c b/src/lib/donau_api_charity_get.c @@ -23,7 +23,7 @@ * @author Lukas Matyja */ #include <gnunet/gnunet_curl_lib.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donau_service.h" #include "donau_api_curl_defaults.h" #include "donau_json_lib.h" diff --git a/src/lib/donau_api_handle.c b/src/lib/donau_api_handle.c @@ -25,7 +25,7 @@ * @author Lukas Matyja */ #include <gnunet/gnunet_curl_lib.h> -#include "taler/taler_json_lib.h" +#include <taler/taler_json_lib.h> #include "donau_service.h" #include "donau_api_curl_defaults.h" #include "donau_json_lib.h" diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c @@ -18,10 +18,10 @@ * @brief functions to initialize parameter arrays * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> //#include <gnunet/gnunet_util_lib.h> //#include "pq_common.h" -#include "taler/taler_pq_lib.h" +#include <taler/taler_pq_lib.h> /** * Extract data from a Postgres database @a result at row @a row. diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c @@ -18,9 +18,9 @@ * @brief Tests for Postgres convenience API * @author Christian Grothoff <christian@grothoff.org> */ -#include "taler/platform.h" +#include <taler/platform.h> #include <taler/taler_util.h> -#include "taler/taler_pq_lib.h" +#include <taler/taler_pq_lib.h> /** diff --git a/src/testing/insert_charity.json b/src/testing/insert_charity.json @@ -0,0 +1,8 @@ +{ + "charity_pub": "EBETNXT9ZF606FRF3WD5N6G2XVD5QHDP2PTQD4GSX4VEN2YYG2C0", + "charity_name": "example", + "charity_url": "example.com", + "max_per_year": "EUR:10", + "receipts_to_date":"EUR:0", + "current_year": 2024 +} diff --git a/src/testing/test_donau_api.c b/src/testing/test_donau_api.c @@ -24,15 +24,15 @@ * @author Marcello Stanisci * @author Lukas Matyja */ -#include "taler/platform.h" -#include "taler/taler_util.h" -#include "taler/taler_signatures.h" -#include "taler/taler_exchange_service.h" -#include "taler/taler_json_lib.h" +#include <taler/platform.h> +#include <taler/taler_util.h> +#include <taler/taler_signatures.h> +#include <taler/taler_exchange_service.h> +#include <taler/taler_json_lib.h> #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_testing_lib.h> #include <microhttpd.h> -#include "taler/taler_bank_service.h" +#include <taler/taler_bank_service.h> #include <taler/taler_testing_lib.h> #include "donau_testing_lib.h" diff --git a/src/testing/test_donau_api.conf b/src/testing/test_donau_api.conf @@ -27,13 +27,13 @@ CONFIG = "postgres:///talercheck" [donau-exchange-secmod-cs] LOOKAHEAD_SIGN = "24 days" -KEY_DIR = ${PWD}/exchange-secmod-cs/keys +KEY_DIR = ${PWD}/test_donau_api_home/exchange-secmod-cs/keys [donau-exchange-secmod-rsa] LOOKAHEAD_SIGN = "24 days" -KEY_DIR = ${PWD}/exchange-secmod-rsa/keys +KEY_DIR = ${PWD}/test_donau_api_home/exchange-secmod-rsa/keys [donau-exchange-secmod-eddsa] LOOKAHEAD_SIGN = "24 days" DURATION = "14 days" -KEY_DIR = ${PWD}/exchange-secmod-eddsa/keys +KEY_DIR = ${PWD}/test_donau_api_home/exchange-secmod-eddsa/keys diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c @@ -22,11 +22,11 @@ * @brief main interpreter loop for testcases * @author Lukas Matyja */ -#include "taler/platform.h" -#include "taler/taler_json_lib.h" +#include <taler/platform.h> +#include <taler/taler_json_lib.h> #include <gnunet/gnunet_curl_lib.h> -#include "taler/taler_signatures.h" -#include "taler/taler_testing_lib.h" +#include <taler/taler_signatures.h> +#include <taler/taler_testing_lib.h> #include "donau_testing_lib.h" diff --git a/src/testing/testing_api_misc.c b/src/testing/testing_api_misc.c @@ -21,10 +21,10 @@ * @brief non-command functions useful for writing tests * @author Christian Grothoff */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> -#include "taler/taler_testing_lib.h" -#include "taler/taler_fakebank_lib.h" +#include <taler/taler_testing_lib.h> +#include <taler/taler_fakebank_lib.h> bool 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 <taler/platform.h> #include "donau_testing_lib.h" diff --git a/src/util/charity_signatures.c b/src/util/charity_signatures.c @@ -19,8 +19,8 @@ * @author Christian Grothoff * @author Lukas Matyja */ -#include "taler/platform.h" -#include "taler/taler_util.h" +#include <taler/platform.h> +#include <taler/taler_util.h> #include "donau_util.h" #include <gnunet/gnunet_common.h> #include <taler/taler_signatures.h> diff --git a/src/util/donau-config.c b/src/util/donau-config.c @@ -24,7 +24,7 @@ * @author Christian Grothoff */ #include "platform.h" -#include "taler/taler_util_lib.h" +#include <taler/taler_util_lib.h> /** diff --git a/src/util/donau_os_installation.c b/src/util/donau_os_installation.c @@ -23,7 +23,7 @@ * @author Christian Grothoff * @author Lukas Matyja */ -#include "taler/platform.h" +#include <taler/platform.h> #include <gnunet/gnunet_util_lib.h> diff --git a/src/util/donau_signatures.c b/src/util/donau_signatures.c @@ -19,9 +19,9 @@ * @author Christian Grothoff * @author Lukas Matyja */ -#include "taler/platform.h" -#include "taler/taler_util.h" -#include "taler/taler_signatures.h" +#include <taler/platform.h> +#include <taler/taler_util.h> +#include <taler/taler_signatures.h> #include "donau_util.h" #include "donau_signatures.h"