commit d96bd93e84f6cc98766395e9bf13cf796e510a42
parent 95e4c9213956667468e4a356eda96a539aaad814
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Fri, 10 Apr 2026 12:32:07 +0200
fix meson for exchangedb/
Diffstat:
4 files changed, 32 insertions(+), 112 deletions(-)
diff --git a/src/exchangedb/account_history.c b/src/exchangedb/account_history.c
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file exchangedb_history.c
+ * @file account_history.c
* @brief helper function to build AML inputs from account histories
* @author Christian Grothoff
*/
diff --git a/src/exchangedb/meson.build b/src/exchangedb/meson.build
@@ -67,11 +67,16 @@ test(
)
-
-plugindir = get_option('libdir') / 'taler-exchange'
-
-if pq_dep.found()
- libtaler_plugin_exchangedb_postgres_la_SOURCES = [
+libtalerexchangedb = library(
+ 'talerexchangedb',
+ [
+ 'account_history.c',
+ 'bench_db.c',
+ 'exchangedb_accounts.c',
+ 'exchangedb_transactions.c',
+ 'free_coin_transaction_list.c',
+ 'free_reserve_history.c',
+ 'persist_aml_program_result.c',
'pg_abort_shard.c',
'pg_activate_signing_key.c',
'pg_add_denomination_key.c',
@@ -80,6 +85,7 @@ if pq_dep.found()
'pg_batch_ensure_coin_known.c',
'pg_begin_revolving_shard.c',
'pg_begin_shard.c',
+ 'pg.c',
'pg_clear_aml_lock.c',
'pg_commit.c',
'pg_complete_shard.c',
@@ -90,18 +96,18 @@ if pq_dep.found()
'pg_delete_aggregation_transient.c',
'pg_delete_shard_locks.c',
'pg_disable_rules.c',
- 'pg_do_withdraw.c',
'pg_do_check_deposit_idempotent.c',
'pg_do_deposit.c',
- 'pg_do_refresh.c',
'pg_do_purse_delete.c',
'pg_do_purse_deposit.c',
'pg_do_purse_merge.c',
'pg_do_recoup.c',
'pg_do_recoup_refresh.c',
+ 'pg_do_refresh.c',
'pg_do_refund.c',
'pg_do_reserve_open.c',
'pg_do_reserve_purse.c',
+ 'pg_do_withdraw.c',
'pg_drain_kyc_alert.c',
'pg_drop_tables.c',
'pg_enable_rules.c',
@@ -114,8 +120,8 @@ if pq_dep.found()
'pg_gc.c',
'pg_get_coin_denomination.c',
'pg_get_coin_transactions.c',
- 'pg_get_denomination_info.c',
'pg_get_denomination_by_serial.c',
+ 'pg_get_denomination_info.c',
'pg_get_denomination_revocation.c',
'pg_get_drain_profit.c',
'pg_get_expired_reserves.c',
@@ -124,13 +130,13 @@ if pq_dep.found()
'pg_get_global_fees.c',
'pg_get_known_coin.c',
'pg_get_kyc_rules.c',
- 'pg_get_refresh.c',
'pg_get_old_coin_by_h_blind.c',
'pg_get_pending_kyc_requirement_process.c',
'pg_get_policy_details.c',
'pg_get_purse_deposit.c',
'pg_get_purse_request.c',
'pg_get_ready_deposit.c',
+ 'pg_get_refresh.c',
'pg_get_reserve_balance.c',
'pg_get_reserve_by_h_planchets.c',
'pg_get_reserve_history.c',
@@ -142,7 +148,6 @@ if pq_dep.found()
'pg_get_wire_hash_for_contract.c',
'pg_get_withdraw.c',
'pg_have_deposit2.c',
- 'pg_helper.h',
'pg_inject_auditor_triggers.c',
'pg_insert_active_legitimization_measure.c',
'pg_insert_aml_decision.c',
@@ -176,8 +181,8 @@ if pq_dep.found()
'pg_iterate_denominations.c',
'pg_iterate_kyc_reference.c',
'pg_iterate_reserve_close_info.c',
- 'pg_kyc_provider_account_lookup.c',
'pg_kycauth_in_insert.c',
+ 'pg_kyc_provider_account_lookup.c',
'pg_lookup_active_legitimization.c',
'pg_lookup_aml_file_number.c',
'pg_lookup_aml_history.c',
@@ -216,8 +221,8 @@ if pq_dep.found()
'pg_rollback.c',
'pg_select_account_merges_above_serial_id.c',
'pg_select_aggregation_amounts_for_kyc_check.c',
- 'pg_select_aggregation_transient.c',
'pg_select_aggregations_above_serial.c',
+ 'pg_select_aggregation_transient.c',
'pg_select_all_kyc_attributes.c',
'pg_select_all_purse_decisions_above_serial_id.c',
'pg_select_all_purse_deletions_above_serial_id.c',
@@ -228,17 +233,17 @@ if pq_dep.found()
'pg_select_auditor_denom_sig.c',
'pg_select_batch_deposits_missing_wire.c',
'pg_select_coin_deposits_above_serial_id.c',
- 'pg_select_contract.c',
'pg_select_contract_by_purse.c',
+ 'pg_select_contract.c',
'pg_select_deposit_amounts_for_kyc_check.c',
'pg_select_exchange_credit_transfers.c',
- 'pg_select_exchange_kycauth_transfers.c',
'pg_select_exchange_debit_transfers.c',
+ 'pg_select_exchange_kycauth_transfers.c',
'pg_select_kyc_accounts.c',
'pg_select_kyc_attributes.c',
'pg_select_merge_amounts_for_kyc_check.c',
- 'pg_select_purse.c',
'pg_select_purse_by_merge_pub.c',
+ 'pg_select_purse.c',
'pg_select_purse_decisions_above_serial_id.c',
'pg_select_purse_deposits_above_serial_id.c',
'pg_select_purse_deposits_by_purse.c',
@@ -250,15 +255,16 @@ if pq_dep.found()
'pg_select_refreshes_above_serial_id.c',
'pg_select_refunds_above_serial_id.c',
'pg_select_refunds_by_coin.c',
- 'pg_select_reserve_close_info.c',
'pg_select_reserve_closed_above_serial_id.c',
+ 'pg_select_reserve_close_info.c',
+ 'pg_select_reserve_close_request_info.c',
'pg_select_reserve_open_above_serial_id.c',
- 'pg_select_reserves_in_above_serial_id.c',
'pg_select_reserves_in_above_serial_id_by_account.c',
- 'pg_select_wire_out_above_serial_id.c',
+ 'pg_select_reserves_in_above_serial_id.c',
'pg_select_wire_out_above_serial_id_by_account.c',
- 'pg_select_withdraw_amounts_for_kyc_check.c',
+ 'pg_select_wire_out_above_serial_id.c',
'pg_select_withdrawals_above_serial_id.c',
+ 'pg_select_withdraw_amounts_for_kyc_check.c',
'pg_set_aml_lock.c',
'pg_set_extension_manifest.c',
'pg_set_purse_balance.c',
@@ -267,6 +273,7 @@ if pq_dep.found()
'pg_start_read_committed.c',
'pg_start_read_only.c',
'pg_store_wire_transfer_out.c',
+ 'pg_template.c',
'pg_test_aml_officer.c',
'pg_trigger_kyc_rule_for_account.c',
'pg_update_aggregation_transient.c',
@@ -278,37 +285,7 @@ if pq_dep.found()
'pg_wire_prepare_data_insert.c',
'pg_wire_prepare_data_mark_failed.c',
'pg_wire_prepare_data_mark_finished.c',
- 'plugin_exchangedb_common.c',
- 'plugin_exchangedb_postgres.c',
- ]
-
- shared_module(
- 'taler_plugin_exchangedb_postgres',
- libtaler_plugin_exchangedb_postgres_la_SOURCES,
- install_rpath: rpath_option,
- dependencies: [
- libtalerutil_dep,
- libtalerpq_dep,
- gnunetpq_dep,
- gnunetutil_dep,
- json_dep,
- pq_dep,
- ],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: exch_plugindir,
- )
-
-endif
-
-libtalerexchangedb = library(
- 'talerexchangedb',
- [
- 'exchangedb_accounts.c',
- 'exchangedb_aml.c',
- 'exchangedb_history.c',
- 'exchangedb_plugin.c',
- 'exchangedb_transactions.c',
+ 'update_rules.c',
],
soversion: solibversions['libtalerexchangedb']['soversion'],
version: solibversions['libtalerexchangedb']['soversion'],
@@ -338,10 +315,10 @@ pkg.generate(
# [oec 20250430] disable test for now
# check_PROGRAMS = \
-# test-exchangedb-postgres
+# test-exchangedb
#executable(
-# 'test-exchangedb-postgres',
+# 'test-exchangedb',
# ['test_exchangedb.c'],
# install_rpath: rpath_option,
# dependencies: [
@@ -373,58 +350,3 @@ executable(
install: false,
)
-executable(
- 'perf_reserves_in_insert-postgres',
- ['perf_reserves_in_insert.c'],
- install_rpath: rpath_option,
- dependencies: [
- libtalerexchangedb_dep,
- libtalerjson_dep,
- libtalerutil_dep,
- libtalerpq_dep,
- gnunetutil_dep,
- gnunetjson_dep,
- json_dep,
- m_dep,
- ],
- include_directories: [incdir, configuration_inc],
- install: false,
-)
-
-
-executable(
- 'perf_select_refunds_by_coin-postgres',
- ['perf_select_refunds_by_coin.c'],
- install_rpath: rpath_option,
- dependencies: [
- libtalerexchangedb_dep,
- libtalerjson_dep,
- libtalerutil_dep,
- libtalerpq_dep,
- gnunetutil_dep,
- gnunetjson_dep,
- json_dep,
- m_dep,
- ],
- include_directories: [incdir, configuration_inc],
- install: false,
-)
-
-
-executable(
- 'perf_deposits_get_ready-postgres',
- ['perf_deposits_get_ready.c'],
- install_rpath: rpath_option,
- dependencies: [
- libtalerexchangedb_dep,
- libtalerjson_dep,
- libtalerutil_dep,
- libtalerpq_dep,
- gnunetutil_dep,
- gnunetjson_dep,
- json_dep,
- m_dep,
- ],
- include_directories: [incdir, configuration_inc],
- install: false,
-)
diff --git a/src/exchangedb/pg.c b/src/exchangedb/pg.c
@@ -15,7 +15,7 @@
*/
/**
- * @file plugin_exchangedb_postgres.c
+ * @file pg.c
* @brief Low-level (statement-level) Postgres database access for the exchange
* @author Florian Dold
* @author Christian Grothoff
diff --git a/src/include/taler/meson.build b/src/include/taler/meson.build
@@ -1,4 +1,4 @@
-subdir('taler-exchange')
+subdir('exchange')
talerinclude_headers = [
@@ -6,7 +6,6 @@ talerinclude_headers = [
'taler_amount_lib.h',
'taler_attributes.h',
'taler_auditordb_lib.h',
- 'taler_auditordb_plugin.h',
'taler_bank_service.h',
'taler_crypto_lib.h',
'taler_curl_lib.h',
@@ -14,7 +13,6 @@ talerinclude_headers = [
'taler_error_codes.h',
'taler_exchange_service.h',
'taler_exchangedb_lib.h',
- 'taler_exchangedb_plugin.h',
'taler_extensions.h',
'taler_extensions_policy.h',
'taler_fakebank_lib.h',
