[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 02/03: fixing merge conflict
|
From: |
gnunet |
|
Subject: |
[taler-exchange] 02/03: fixing merge conflict |
|
Date: |
Thu, 08 Feb 2024 00:08:15 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 97f3e30c3d4081a6765c914c94b6cbf3a75110f3
Merge: c6b14a97 e0d46f96
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Feb 7 23:51:33 2024 +0100
fixing merge conflict
.gitignore | 4 +-
contrib/wallet-core | 2 +-
debian/taler-auditor.install | 1 -
doc/Makefile.am | 1 -
doc/prebuilt | 2 +-
src/auditor/Makefile.am | 10 -
src/auditor/report-lib.c | 65 +-
src/auditor/report-lib.h | 48 +-
src/auditor/taler-auditor-dbinit.c | 4 +-
src/auditor/taler-auditor-exchange.c | 224 ----
src/auditor/taler-auditor-httpd.c | 47 +-
src/auditor/taler-auditor-httpd.h | 6 +
.../taler-auditor-httpd_deposit-confirmation-get.c | 46 +-
.../taler-auditor-httpd_deposit-confirmation.c | 5 +-
src/auditor/taler-helper-auditor-aggregation.c | 81 +-
src/auditor/taler-helper-auditor-coins.c | 407 ++++---
src/auditor/taler-helper-auditor-deposits.c | 48 +-
src/auditor/taler-helper-auditor-purses.c | 169 +--
src/auditor/taler-helper-auditor-reserves.c | 320 ++++--
src/auditor/taler-helper-auditor-wire.c | 244 ++--
src/auditordb/.gitignore | 4 +
src/auditordb/0002-auditor_balances.sql | 5 +-
src/auditordb/0002-auditor_progress.sql | 2 +-
src/auditordb/Makefile.am | 132 +--
src/auditordb/auditor-0001.sql | 581 +++++-----
...ces.sql => auditor_do_get_auditor_progress.sql} | 40 +-
src/auditordb/auditor_do_get_balance.sql | 47 +
...te_exchange.c => pg_del_denomination_balance.c} | 24 +-
...nce_summary.h => pg_del_denomination_balance.h} | 21 +-
src/auditordb/pg_del_reserve_info.c | 11 +-
src/auditordb/pg_del_reserve_info.h | 4 +-
src/auditordb/pg_delete_deposit_confirmations.c | 27 +-
src/auditordb/pg_delete_deposit_confirmations.h | 20 +-
src/auditordb/pg_delete_exchange.h | 43 -
src/auditordb/pg_delete_pending_deposit.c | 5 +-
src/auditordb/pg_delete_pending_deposit.h | 2 -
src/auditordb/pg_delete_purse_info.c | 7 +-
src/auditordb/pg_delete_purse_info.h | 4 +-
src/auditordb/pg_get_auditor_progress.c | 178 +++
...r_progress_coin.h => pg_get_auditor_progress.h} | 23 +-
.../pg_get_auditor_progress_aggregation.c | 56 -
.../pg_get_auditor_progress_aggregation.h | 43 -
src/auditordb/pg_get_auditor_progress_coin.c | 77 --
.../pg_get_auditor_progress_deposit_confirmation.c | 54 -
.../pg_get_auditor_progress_deposit_confirmation.h | 43 -
src/auditordb/pg_get_auditor_progress_purse.c | 68 --
src/auditordb/pg_get_auditor_progress_reserve.c | 77 --
src/auditordb/pg_get_auditor_progress_reserve.h | 43 -
src/auditordb/pg_get_balance.c | 183 +++
...t_auditor_progress_purse.h => pg_get_balance.h} | 26 +-
src/auditordb/pg_get_balance_summary.c | 80 --
src/auditordb/pg_get_deposit_confirmations.c | 19 +-
src/auditordb/pg_get_deposit_confirmations.h | 2 +
src/auditordb/pg_get_predicted_balance.c | 59 -
src/auditordb/pg_get_predicted_balance.h | 44 -
src/auditordb/pg_get_purse_info.c | 5 +-
src/auditordb/pg_get_purse_info.h | 2 -
src/auditordb/pg_get_purse_summary.c | 58 -
src/auditordb/pg_get_purse_summary.h | 43 -
src/auditordb/pg_get_reserve_info.c | 8 +-
src/auditordb/pg_get_reserve_info.h | 2 -
src/auditordb/pg_get_reserve_summary.c | 81 --
src/auditordb/pg_get_reserve_summary.h | 43 -
.../pg_get_wire_auditor_account_progress.c | 68 --
.../pg_get_wire_auditor_account_progress.h | 48 -
src/auditordb/pg_get_wire_auditor_progress.c | 62 -
src/auditordb/pg_get_wire_auditor_progress.h | 44 -
src/auditordb/pg_get_wire_fee_summary.c | 6 +-
src/auditordb/pg_get_wire_fee_summary.h | 2 -
src/auditordb/pg_insert_auditor_progress.c | 97 ++
...tor_progress.h => pg_insert_auditor_progress.h} | 21 +-
.../pg_insert_auditor_progress_aggregation.c | 51 -
.../pg_insert_auditor_progress_aggregation.h | 45 -
src/auditordb/pg_insert_auditor_progress_coin.c | 65 --
src/auditordb/pg_insert_auditor_progress_coin.h | 44 -
..._insert_auditor_progress_deposit_confirmation.c | 53 -
..._insert_auditor_progress_deposit_confirmation.h | 44 -
src/auditordb/pg_insert_auditor_progress_purse.c | 59 -
src/auditordb/pg_insert_auditor_progress_purse.h | 44 -
src/auditordb/pg_insert_auditor_progress_reserve.c | 65 --
src/auditordb/pg_insert_auditor_progress_reserve.h | 43 -
src/auditordb/pg_insert_balance.c | 97 ++
.../{pg_del_reserve_info.h => pg_insert_balance.h} | 26 +-
src/auditordb/pg_insert_balance_summary.c | 76 --
src/auditordb/pg_insert_balance_summary.h | 44 -
src/auditordb/pg_insert_deposit_confirmation.c | 6 +-
src/auditordb/pg_insert_exchange.c | 49 -
src/auditordb/pg_insert_exchange.h | 43 -
src/auditordb/pg_insert_exchange_signkey.c | 6 +-
src/auditordb/pg_insert_historic_denom_revenue.c | 7 +-
src/auditordb/pg_insert_historic_denom_revenue.h | 2 -
src/auditordb/pg_insert_historic_reserve_revenue.c | 7 +-
src/auditordb/pg_insert_historic_reserve_revenue.h | 2 -
src/auditordb/pg_insert_pending_deposit.c | 7 +-
src/auditordb/pg_insert_pending_deposit.h | 2 -
src/auditordb/pg_insert_predicted_result.c | 56 -
src/auditordb/pg_insert_predicted_result.h | 46 -
src/auditordb/pg_insert_purse_info.c | 5 +-
src/auditordb/pg_insert_purse_info.h | 2 -
src/auditordb/pg_insert_purse_summary.c | 54 -
src/auditordb/pg_insert_purse_summary.h | 45 -
src/auditordb/pg_insert_reserve_info.c | 10 +-
src/auditordb/pg_insert_reserve_info.h | 2 -
src/auditordb/pg_insert_reserve_summary.c | 75 --
src/auditordb/pg_insert_reserve_summary.h | 45 -
.../pg_insert_wire_auditor_account_progress.c | 61 -
.../pg_insert_wire_auditor_account_progress.h | 48 -
src/auditordb/pg_insert_wire_auditor_progress.c | 55 -
src/auditordb/pg_insert_wire_fee_summary.c | 52 -
src/auditordb/pg_insert_wire_fee_summary.h | 44 -
src/auditordb/pg_list_exchanges.c | 125 --
src/auditordb/pg_list_exchanges.h | 43 -
src/auditordb/pg_select_historic_denom_revenue.c | 5 +-
src/auditordb/pg_select_historic_denom_revenue.h | 3 -
src/auditordb/pg_select_historic_reserve_revenue.c | 5 +-
src/auditordb/pg_select_historic_reserve_revenue.h | 2 -
src/auditordb/pg_select_pending_deposits.c | 1 -
src/auditordb/pg_select_pending_deposits.h | 2 -
src/auditordb/pg_select_purse_expired.c | 5 +-
src/auditordb/pg_select_purse_expired.h | 2 -
src/auditordb/pg_template.c | 2 +-
src/auditordb/pg_template.h | 2 +-
src/auditordb/pg_update_auditor_progress.c | 99 ++
...tor_progress.h => pg_update_auditor_progress.h} | 21 +-
.../pg_update_auditor_progress_aggregation.c | 50 -
.../pg_update_auditor_progress_aggregation.h | 44 -
src/auditordb/pg_update_auditor_progress_coin.c | 64 --
src/auditordb/pg_update_auditor_progress_coin.h | 44 -
..._update_auditor_progress_deposit_confirmation.c | 50 -
..._update_auditor_progress_deposit_confirmation.h | 45 -
src/auditordb/pg_update_auditor_progress_purse.c | 58 -
src/auditordb/pg_update_auditor_progress_purse.h | 44 -
src/auditordb/pg_update_auditor_progress_reserve.c | 64 --
src/auditordb/pg_update_auditor_progress_reserve.h | 43 -
src/auditordb/pg_update_balance.c | 100 ++
..._update_purse_summary.h => pg_update_balance.h} | 24 +-
src/auditordb/pg_update_balance_summary.c | 75 --
src/auditordb/pg_update_balance_summary.h | 44 -
src/auditordb/pg_update_predicted_result.c | 55 -
src/auditordb/pg_update_predicted_result.h | 46 -
src/auditordb/pg_update_purse_info.c | 9 +-
src/auditordb/pg_update_purse_info.h | 2 -
src/auditordb/pg_update_purse_summary.c | 53 -
src/auditordb/pg_update_reserve_info.c | 9 +-
src/auditordb/pg_update_reserve_info.h | 2 -
src/auditordb/pg_update_reserve_summary.c | 69 --
src/auditordb/pg_update_reserve_summary.h | 45 -
.../pg_update_wire_auditor_account_progress.c | 59 -
.../pg_update_wire_auditor_account_progress.h | 49 -
src/auditordb/pg_update_wire_auditor_progress.c | 54 -
src/auditordb/pg_update_wire_fee_summary.c | 5 +-
src/auditordb/pg_update_wire_fee_summary.h | 2 -
src/auditordb/plugin_auditordb_postgres.c | 308 ++---
...0002-auditor_balances.sql => procedures.sql.in} | 24 +-
src/auditordb/test_auditordb.c | 280 +----
src/auditordb/test_auditordb_checkpoints.c | 386 +++++++
src/exchange/taler-exchange-httpd.c | 9 +-
src/exchangedb/test_exchangedb.c | 1 +
src/include/taler_auditor_service.h | 5 +
src/include/taler_auditordb_plugin.h | 1195 +++-----------------
src/lib/auditor_api_get_config.c | 4 +-
src/pq/pq_common.h | 15 +
src/pq/pq_result_helper.c | 41 +-
src/testing/taler-unified-setup.sh | 4 -
164 files changed, 2952 insertions(+), 6710 deletions(-)
diff --cc contrib/wallet-core
index a17a7a51,a17a7a51..d6ea0db9
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit a17a7a51dd50e2f508b078b9aada038fe124ff9c
++Subproject commit d6ea0db963a73fa67eac98122ba2600ec7314fb6
diff --cc doc/prebuilt
index bd40be2f,bd40be2f..14e26d5f
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit bd40be2fd4ce80106dc40a5ac4cc5c1695134063
++Subproject commit 14e26d5fe2c0ceed27e27d8c79db14775ddfd796
diff --cc src/auditor/taler-auditor-httpd.c
index be6d74be,7b7bf98a..d9cdff8d
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@@ -48,8 -48,8 +48,9 @@@
* release version, and the format is NOT the same that semantic
* versioning uses either.
*/
- #define AUDITOR_PROTOCOL_VERSION "0:1:0"
+ #define AUDITOR_PROTOCOL_VERSION "1:0:1"
+
+
/**
* Backlog for listen operation on unix domain sockets.
*/
diff --cc src/auditor/taler-helper-auditor-deposits.c
index 271f1c36,b5c4a386..25697bbb
--- a/src/auditor/taler-helper-auditor-deposits.c
+++ b/src/auditor/taler-helper-auditor-deposits.c
@@@ -277,22 -272,30 +280,22 @@@ analyze_deposit_confirmations (void *cl
return dcc.qs;
}
- if (UINT64_MAX == dcc.first_missed_coin_serial)
- ppdc.last_deposit_confirmation_serial_id = dcc.last_seen_coin_serial;
- else
- ppdc.last_deposit_confirmation_serial_id = dcc.first_missed_coin_serial -
1;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "getting in here when i shouldnt\n");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "lastseencoinserialid %lu\n",
- dcc.last_seen_coin_serial);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "dcc.qs %u\n",
- dcc.qs);
+ /* if (UINT64_MAX == dcc.first_missed_coin_serial)
+ ppdc.last_deposit_confirmation_serial_id = dcc.last_seen_coin_serial;
+ else
+ ppdc.last_deposit_confirmation_serial_id = dcc.first_missed_coin_serial
- 1;
+ */
/* sync 'cc' back to disk */
if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsp)
- qs = TALER_ARL_adb->update_auditor_progress_deposit_confirmation (
+ qs = TALER_ARL_adb->update_auditor_progress (
TALER_ARL_adb->cls,
- &TALER_ARL_master_pub,
- &ppdc);
+ TALER_ARL_SET_PP (deposit_confirmation_serial_id),
+ NULL);
else
- qs = TALER_ARL_adb->insert_auditor_progress_deposit_confirmation (
+ qs = TALER_ARL_adb->insert_auditor_progress (
TALER_ARL_adb->cls,
- &TALER_ARL_master_pub,
- &ppdc);
+ TALER_ARL_SET_PP (deposit_confirmation_serial_id),
+ NULL);
if (0 >= qs)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.