taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix typo: s/issattr/isattr/g (45 instances)

Browse Source
This commit is contained in:
Thien-Thi Nguyen 2022-09-07 13:23:39 -04:00
parent 96fae17b32
commit e83191c421
No known key found for this signature in database
GPG Key ID: 670322244C807502
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/auditor-report.tex.j2
View File

@ -901,7 +901,7 @@ actually received in some reserves.
{% endif %} {% endif %}
\subsection{Missattributed incoming wire transfers} \subsection{Misattributed incoming wire transfers}
This section lists cases where the sender account record of an This section lists cases where the sender account record of an
incoming wire transfer differs between the exchange and the bank. incoming wire transfer differs between the exchange and the bank.
@ -911,7 +911,7 @@ account.
% Table generation tested by testcase #9 in test-auditor.sh % Table generation tested by testcase #9 in test-auditor.sh
{% if wire.missattribution_in_inconsistencies|length() == 0 %} {% if wire.misattribution_in_inconsistencies|length() == 0 %}
{\bf All incoming wire transfer sender accounts matched up.} {\bf All incoming wire transfer sender accounts matched up.}
{% else %} {% else %}
\begin{longtable}{p{8.5cm}|r} \begin{longtable}{p{8.5cm}|r}
@ -926,11 +926,11 @@ account.
\endfoot \endfoot
\hline \hline
{\bf Total amount} & {\bf Total amount} &
{{ wire.total_missattribution_in}} \\ {{ wire.total_misattribution_in}} \\
\caption{Incoming wire transfer sender accounts not matching up.} \caption{Incoming wire transfer sender accounts not matching up.}
\label{table:wire_in:sender_account_inconsistencies} \label{table:wire_in:sender_account_inconsistencies}
\endlastfoot \endlastfoot
{% for item in wire.missattribution_in_inconsistencies %} {% for item in wire.misattribution_in_inconsistencies %}
{\tt \small \truncate{8.3cm}{ {{ item.reserve_pub }} } } & {\tt \small \truncate{8.3cm}{ {{ item.reserve_pub }} } } &
{{ item.amount }} \\ \hline {{ item.amount }} \\ \hline
{% endfor %} {% endfor %}

6
contrib/samples/wire-auditor.json
View File

@ -38,8 +38,8 @@
"value": 5, "value": 5,
"fraction": 1000000 "fraction": 1000000
}, },
"missattribution_in_inconsistencies": [], "misattribution_in_inconsistencies": [],
"total_missattribution_in": { "total_misattribution_in": {
"currency": "KUDOS", "currency": "KUDOS",
"value": 0, "value": 0,
"fraction": 0 "fraction": 0
@ -233,4 +233,4 @@
"fraction": 1000000 "fraction": 1000000
}, },
"lag_details": [] "lag_details": []
} }

24
src/auditor/taler-helper-auditor-wire.c
View File

@ -204,7 +204,7 @@ static json_t *report_reserve_in_inconsistencies;
* Array of reports about wrong bank account being recorded for * Array of reports about wrong bank account being recorded for
* incoming wire transfers. * incoming wire transfers.
*/ */
static json_t *report_missattribution_in_inconsistencies; static json_t *report_misattribution_in_inconsistencies;
/** /**
* Array of reports about row inconsistencies. * Array of reports about row inconsistencies.
@ -267,7 +267,7 @@ static struct TALER_Amount total_bad_amount_in_minus;
* for incoming funds and may thus wire funds to the wrong * for incoming funds and may thus wire funds to the wrong
* destination when closing the reserve. * destination when closing the reserve.
*/ */
static struct TALER_Amount total_missattribution_in; static struct TALER_Amount total_misattribution_in;
/** /**
* Total amount which the exchange did not transfer in time. * Total amount which the exchange did not transfer in time.
@ -499,11 +499,11 @@ do_shutdown (void *cls)
TALER_JSON_pack_amount ("total_wire_in_delta_minus", TALER_JSON_pack_amount ("total_wire_in_delta_minus",
&total_bad_amount_in_minus), &total_bad_amount_in_minus),
/* Tested in test-auditor.sh #9 */ /* Tested in test-auditor.sh #9 */
GNUNET_JSON_pack_array_steal ("missattribution_in_inconsistencies", GNUNET_JSON_pack_array_steal ("misattribution_in_inconsistencies",
report_missattribution_in_inconsistencies), report_misattribution_in_inconsistencies),
/* Tested in test-auditor.sh #9 */ /* Tested in test-auditor.sh #9 */
TALER_JSON_pack_amount ("total_missattribution_in", TALER_JSON_pack_amount ("total_misattribution_in",
&total_missattribution_in), &total_misattribution_in),
GNUNET_JSON_pack_array_steal ("row_inconsistencies", GNUNET_JSON_pack_array_steal ("row_inconsistencies",
report_row_inconsistencies), report_row_inconsistencies),
/* Tested in test-auditor.sh #10/#17 */ /* Tested in test-auditor.sh #10/#17 */
@ -553,7 +553,7 @@ do_shutdown (void *cls)
report_reserve_in_inconsistencies = NULL; report_reserve_in_inconsistencies = NULL;
report_row_inconsistencies = NULL; report_row_inconsistencies = NULL;
report_row_minor_inconsistencies = NULL; report_row_minor_inconsistencies = NULL;
report_missattribution_in_inconsistencies = NULL; report_misattribution_in_inconsistencies = NULL;
report_lags = NULL; report_lags = NULL;
report_closure_lags = NULL; report_closure_lags = NULL;
report_account_progress = NULL; report_account_progress = NULL;
@ -1938,7 +1938,7 @@ history_credit_cb (void *cls,
if (0 != strcasecmp (details->debit_account_uri, if (0 != strcasecmp (details->debit_account_uri,
rii->details.debit_account_uri)) rii->details.debit_account_uri))
{ {
TALER_ARL_report (report_missattribution_in_inconsistencies, TALER_ARL_report (report_misattribution_in_inconsistencies,
GNUNET_JSON_PACK ( GNUNET_JSON_PACK (
TALER_JSON_pack_amount ("amount", TALER_JSON_pack_amount ("amount",
&rii->details.amount), &rii->details.amount),
@ -1949,8 +1949,8 @@ history_credit_cb (void *cls,
GNUNET_JSON_pack_data_auto ( GNUNET_JSON_pack_data_auto (
"reserve_pub", "reserve_pub",
&rii->details.reserve_pub))); &rii->details.reserve_pub)));
TALER_ARL_amount_add (&total_missattribution_in, TALER_ARL_amount_add (&total_misattribution_in,
&total_missattribution_in, &total_misattribution_in,
&rii->details.amount); &rii->details.amount);
} }
if (GNUNET_TIME_timestamp_cmp (details->execution_date, if (GNUNET_TIME_timestamp_cmp (details->execution_date,
@ -2342,7 +2342,7 @@ run (void *cls,
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(report_row_inconsistencies = json_array ())); (report_row_inconsistencies = json_array ()));
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(report_missattribution_in_inconsistencies (report_misattribution_in_inconsistencies
= json_array ())); = json_array ()));
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(report_lags = json_array ())); (report_lags = json_array ()));
@ -2364,7 +2364,7 @@ run (void *cls,
&total_bad_amount_in_minus)); &total_bad_amount_in_minus));
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_amount_set_zero (TALER_ARL_currency, TALER_amount_set_zero (TALER_ARL_currency,
&total_missattribution_in)); &total_misattribution_in));
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_amount_set_zero (TALER_ARL_currency, TALER_amount_set_zero (TALER_ARL_currency,
&total_amount_lag)); &total_amount_lag));

22
src/auditor/test-auditor.sh
View File

@ -292,7 +292,7 @@ jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail
echo -n "Test for wire inconsistencies... " echo -n "Test for wire inconsistencies... "
jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run" jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run" jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run" jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run" jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run" jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run" jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
@ -342,10 +342,10 @@ if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total wire delta minus wrong, got $WIRED" exit_fail "Expected total wire delta minus wrong, got $WIRED"
fi fi
WIRED=`jq -r .total_missattribution_in < test-audit-wire.json` WIRED=`jq -r .total_misattribution_in < test-audit-wire.json`
if test $WIRED != "TESTKUDOS:0" if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total missattribution in wrong, got $WIRED" exit_fail "Expected total misattribution in wrong, got $WIRED"
fi fi
echo PASS echo PASS
@ -413,7 +413,7 @@ jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail
echo -n "Test for wire inconsistencies... " echo -n "Test for wire inconsistencies... "
jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run" jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run" jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run" jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run" jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run" jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run" jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
@ -466,10 +466,10 @@ if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total wire delta minus wrong, got $WIRED" exit_fail "Expected total wire delta minus wrong, got $WIRED"
fi fi
WIRED=`jq -r .total_missattribution_in < test-audit-wire.json` WIRED=`jq -r .total_misattribution_in < test-audit-wire.json`
if test $WIRED != "TESTKUDOS:0" if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total missattribution in wrong, got $WIRED" exit_fail "Expected total misattribution in wrong, got $WIRED"
fi fi
# Database was unmodified, no need to undo # Database was unmodified, no need to undo
echo "OK" echo "OK"
@ -847,12 +847,12 @@ echo "UPDATE TalerIncomingPayments SET incomingPaytoUri='payto://iban/SANDBOXX/D
run_audit run_audit
echo -n "Testing inconsistency detection... " echo -n "Testing inconsistency detection... "
AMOUNT=`jq -r .missattribution_in_inconsistencies[0].amount < test-audit-wire.json` AMOUNT=`jq -r .misattribution_in_inconsistencies[0].amount < test-audit-wire.json`
if test "x$AMOUNT" != "xTESTKUDOS:10" if test "x$AMOUNT" != "xTESTKUDOS:10"
then then
exit_fail "Reported amount wrong: $AMOUNT" exit_fail "Reported amount wrong: $AMOUNT"
fi fi
AMOUNT=`jq -r .total_missattribution_in < test-audit-wire.json` AMOUNT=`jq -r .total_misattribution_in < test-audit-wire.json`
if test "x$AMOUNT" != "xTESTKUDOS:10" if test "x$AMOUNT" != "xTESTKUDOS:10"
then then
exit_fail "Reported total amount wrong: $AMOUNT" exit_fail "Reported total amount wrong: $AMOUNT"
@ -1945,7 +1945,7 @@ jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail
echo -n "Test for wire inconsistencies... " echo -n "Test for wire inconsistencies... "
jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run" jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run" jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run" jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run" jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run" jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run" jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
@ -1995,10 +1995,10 @@ if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total wire delta minus wrong, got $WIRED" exit_fail "Expected total wire delta minus wrong, got $WIRED"
fi fi
WIRED=`jq -r .total_missattribution_in < test-audit-wire.json` WIRED=`jq -r .total_misattribution_in < test-audit-wire.json`
if test $WIRED != "TESTKUDOS:0" if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total missattribution in wrong, got $WIRED" exit_fail "Expected total misattribution in wrong, got $WIRED"
fi fi
echo PASS echo PASS

12
src/auditor/test-revocation.sh
View File

@ -266,7 +266,7 @@ jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail
echo -n "Test for wire inconsistencies... " echo -n "Test for wire inconsistencies... "
jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run" jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run" jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run" jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run" jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run" jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run" jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
@ -316,10 +316,10 @@ if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total wire delta minus wrong, got $WIRED" exit_fail "Expected total wire delta minus wrong, got $WIRED"
fi fi
WIRED=`jq -r .total_missattribution_in < test-audit-wire.json` WIRED=`jq -r .total_misattribution_in < test-audit-wire.json`
if test $WIRED != "TESTKUDOS:0" if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total missattribution in wrong, got $WIRED" exit_fail "Expected total misattribution in wrong, got $WIRED"
fi fi
echo PASS echo PASS
@ -387,7 +387,7 @@ jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail
echo -n "Test for wire inconsistencies... " echo -n "Test for wire inconsistencies... "
jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run" jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run" jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run" jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run" jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run" jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run" jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
@ -418,10 +418,10 @@ if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total wire delta minus wrong, got $WIRED" exit_fail "Expected total wire delta minus wrong, got $WIRED"
fi fi
WIRED=`jq -r .total_missattribution_in < test-audit-wire.json` WIRED=`jq -r .total_misattribution_in < test-audit-wire.json`
if test $WIRED != "TESTKUDOS:0" if test $WIRED != "TESTKUDOS:0"
then then
exit_fail "Expected total missattribution in wrong, got $WIRED" exit_fail "Expected total misattribution in wrong, got $WIRED"
fi fi
# Database was unmodified, no need to undo # Database was unmodified, no need to undo