diff options
| author | Christian Grothoff <christian@grothoff.org> | 2024-08-25 13:17:43 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2024-08-25 13:17:43 +0200 |
| commit | aa0c719f59bfc911ec9646ab1a2138c40c2a4e3b (patch) | |
| tree | 89e5eae8f52bfb330638056dd26bac43954896a5 | |
| parent | f74a3a754151dfdb7c207d7af0b2354cf18f682b (diff) | |
fix misc. auditor issues
| -rw-r--r-- | src/auditor/taler-helper-auditor-aggregation.c | 2 | ||||
| -rwxr-xr-x | src/auditor/test-auditor.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c index c60397a07..efb4069ad 100644 --- a/src/auditor/taler-helper-auditor-aggregation.c +++ b/src/auditor/taler-helper-auditor-aggregation.c @@ -1341,9 +1341,9 @@ check_wire_out_cb (void *cls, { struct TALER_AUDITORDB_WireOutInconsistency woi = { - .row_id = rowid, .destination_account = (char *) payto_uri, .diagnostic = "aggregated amount does not match expectations", + .wire_out_row_id = rowid, .expected = final_amount, .claimed = *amount }; diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index 17b62653f..501b1854e 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -1767,10 +1767,10 @@ function test_23() { > /dev/null \ || exit_fail "Wire out inconsistency not detected" - ROW=$(jq .wire_out_inconsistency[0].row_id < ${MY_TMP_DIR}/wire-out-inconsistency.json) + ROW=$(jq .wire_out_inconsistency[0].wire_out_row_id < ${MY_TMP_DIR}/wire-out-inconsistency.json) if [ "$ROW" != 1 ] then - exit_fail "Row wrong" + exit_fail "Row '$ROW' is wrong" fi call_endpoint "balances" "aggregation_total_wire_out_delta_plus" @@ -1801,24 +1801,24 @@ function test_23() { call_endpoint "wire-out-inconsistency" jq -e .wire_out_inconsistency[0] < ${MY_TMP_DIR}/wire-out-inconsistency.json > /dev/null || exit_fail "Wire out inconsistency not detected" - ROW=$(jq .wire_out_inconsistency[0].rowid < ${MY_TMP_DIR}/test-audit-aggregation.out) + ROW=$(jq .wire_out_inconsistency[0].wire_out_row_id < ${MY_TMP_DIR}/wire-out-inconsistency.json) if [ "$ROW" != 1 ] then - exit_fail "Row wrong" + exit_fail "Row '$ROW' is wrong" fi call_endpoint "balances" "aggregation_total_wire_out_delta_minus" AMOUNT=$(jq -r .balances[0].balance_value < ${MY_TMP_DIR}/aggregation_total_wire_out_delta_minus.json) if [ "$AMOUNT" != "TESTKUDOS:0" ] then - exit_fail "Reported amount wrong: $AMOUNT" + exit_fail "Reported amount wrong: '$AMOUNT'" fi call_endpoint "balances" "aggregation_total_wire_out_delta_plus" AMOUNT=$(jq -r .balances[0].balance_value < ${MY_TMP_DIR}/aggregation_total_wire_out_delta_plus.json) if [ "$AMOUNT" != "TESTKUDOS:0.01" ] then - exit_fail "Reported total amount wrong: $AMOUNT" + exit_fail "Reported total amount wrong: '$AMOUNT'" fi echo "PASS" |