diff options
author | Christian Grothoff <christian@grothoff.org> | 2024-02-07 23:51:33 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2024-02-07 23:56:07 +0100 |
commit | 97f3e30c3d4081a6765c914c94b6cbf3a75110f3 (patch) | |
tree | 5ff0d97240d39ab987564154d9d9a3f4a88eebf5 /src/auditor/taler-helper-auditor-deposits.c | |
parent | c6b14a97c57528cbcf5e23e20707e8ec50b7faec (diff) | |
parent | e0d46f96859b33b3f04791028e30bce4f0173567 (diff) | |
download | exchange-97f3e30c3d4081a6765c914c94b6cbf3a75110f3.tar.gz exchange-97f3e30c3d4081a6765c914c94b6cbf3a75110f3.tar.bz2 exchange-97f3e30c3d4081a6765c914c94b6cbf3a75110f3.zip |
fixing merge conflict
Diffstat (limited to 'src/auditor/taler-helper-auditor-deposits.c')
-rw-r--r-- | src/auditor/taler-helper-auditor-deposits.c | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/src/auditor/taler-helper-auditor-deposits.c b/src/auditor/taler-helper-auditor-deposits.c index 271f1c363..25697bbbc 100644 --- a/src/auditor/taler-helper-auditor-deposits.c +++ b/src/auditor/taler-helper-auditor-deposits.c @@ -218,18 +218,17 @@ test_dc (void *cls, static enum GNUNET_DB_QueryStatus analyze_deposit_confirmations (void *cls) { - struct TALER_AUDITORDB_ProgressPointDepositConfirmation ppdc; + TALER_ARL_DEF_PP (deposit_confirmation_serial_id); struct DepositConfirmationContext dcc; enum GNUNET_DB_QueryStatus qs; enum GNUNET_DB_QueryStatus qsx; enum GNUNET_DB_QueryStatus qsp; (void) cls; - ppdc.last_deposit_confirmation_serial_id = 0; - qsp = TALER_ARL_adb->get_auditor_progress_deposit_confirmation ( + qsp = TALER_ARL_adb->get_auditor_progress ( TALER_ARL_adb->cls, - &TALER_ARL_master_pub, - &ppdc); + TALER_ARL_GET_PP (deposit_confirmation_serial_id), + NULL); if (0 > qsp) { @@ -245,7 +244,8 @@ analyze_deposit_confirmations (void *cls) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Resuming deposit confirmation audit at %llu\n", - (unsigned long long) ppdc.last_deposit_confirmation_serial_id); + (unsigned long long) TALER_ARL_USE_PP ( + deposit_confirmation_serial_id)); } /* setup 'cc' */ @@ -255,11 +255,13 @@ analyze_deposit_confirmations (void *cls) dcc.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT; dcc.missed_count = 0LLU; dcc.first_missed_coin_serial = UINT64_MAX; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "lastdepconfserialid %lu\n", - ppdc.last_deposit_confirmation_serial_id); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "lastdepconfserialid %lu\n", + TALER_ARL_USE_PP (deposit_confirmation_serial_id)); qsx = TALER_ARL_adb->get_deposit_confirmations ( TALER_ARL_adb->cls, - ppdc.last_deposit_confirmation_serial_id, + TALER_ARL_USE_PP (deposit_confirmation_serial_id), + true, /* return suppressed */ &test_dc, &dcc); if (0 > qsx) @@ -270,29 +272,30 @@ analyze_deposit_confirmations (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Analyzed %d deposit confirmations (above serial ID %llu)\n", (int) qsx, - (unsigned long long) ppdc.last_deposit_confirmation_serial_id); + (unsigned long long) TALER_ARL_USE_PP ( + deposit_confirmation_serial_id)); if (0 > dcc.qs) { GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == dcc.qs); 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; - + /* 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, @@ -306,7 +309,8 @@ analyze_deposit_confirmations (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Concluded deposit confirmation audit step at %llu\n", - (unsigned long long) ppdc.last_deposit_confirmation_serial_id); + (unsigned long long) TALER_ARL_USE_PP ( + deposit_confirmation_serial_id)); return qs; } |