[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated (240b2368 -> dff81f45)
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated (240b2368 -> dff81f45) |
|
Date: |
Tue, 24 Mar 2020 17:35:20 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository exchange.
from 240b2368 finish review of coins auditor analysis logic, improve error
handling
new 9ad9e7e0 add more tests
new dff81f45 more testing for auditor logic
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/auditor/generate-auditor-basedb.conf | 14 +-
src/auditor/taler-helper-auditor-aggregation.c | 4 +-
src/auditor/taler-helper-auditor-coins.c | 21 ++-
src/auditor/taler-helper-auditor-reserves.c | 9 +-
src/auditor/test-auditor.sh | 173 +++++++++++++++++++++++--
5 files changed, 197 insertions(+), 24 deletions(-)
diff --git a/src/auditor/generate-auditor-basedb.conf
b/src/auditor/generate-auditor-basedb.conf
index ffaa5471..a9ee5d89 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -95,14 +95,24 @@ HONOR_default = YES
ACTIVE_default = YES
[fees-x-taler-bank]
-wire-fee-2019 = TESTKUDOS:0.01
-closing-fee-2019 = TESTKUDOS:0.01
wire-fee-2020 = TESTKUDOS:0.01
closing-fee-2020 = TESTKUDOS:0.01
wire-fee-2021 = TESTKUDOS:0.01
closing-fee-2021 = TESTKUDOS:0.01
wire-fee-2022 = TESTKUDOS:0.01
closing-fee-2022 = TESTKUDOS:0.01
+wire-fee-2023 = TESTKUDOS:0.01
+closing-fee-2023 = TESTKUDOS:0.01
+wire-fee-2024 = TESTKUDOS:0.01
+closing-fee-2024 = TESTKUDOS:0.01
+wire-fee-2025 = TESTKUDOS:0.01
+closing-fee-2025 = TESTKUDOS:0.01
+wire-fee-2026 = TESTKUDOS:0.01
+closing-fee-2026 = TESTKUDOS:0.01
+wire-fee-2027 = TESTKUDOS:0.01
+closing-fee-2027 = TESTKUDOS:0.01
+wire-fee-2028 = TESTKUDOS:0.01
+closing-fee-2028 = TESTKUDOS:0.01
[merchant-instance-wireformat-default]
TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tutorial.json
diff --git a/src/auditor/taler-helper-auditor-aggregation.c
b/src/auditor/taler-helper-auditor-aggregation.c
index 9982612e..a26cf5dc 100644
--- a/src/auditor/taler-helper-auditor-aggregation.c
+++ b/src/auditor/taler-helper-auditor-aggregation.c
@@ -1490,10 +1490,10 @@ run (void *cls,
"total_wire_out_delta_minus",
TALER_JSON_from_amount (
&total_wire_out_delta_minus),
- /* FIXME: Tested in test-auditor.sh #?? */
+ /* Tested in test-auditor.sh #28 */
"bad_sig_losses",
report_bad_sig_losses,
- /* FIXME: Tested in test-auditor.sh #?? */
+ /* Tested in test-auditor.sh #28 */
"total_bad_sig_loss",
TALER_JSON_from_amount (&total_bad_sig_loss),
/* block #2 */
diff --git a/src/auditor/taler-helper-auditor-coins.c
b/src/auditor/taler-helper-auditor-coins.c
index 5ce3e77e..375c901e 100644
--- a/src/auditor/taler-helper-auditor-coins.c
+++ b/src/auditor/taler-helper-auditor-coins.c
@@ -283,9 +283,11 @@ report_emergency_by_count (
* @param exchange amount calculated by exchange
* @param auditor amount calculated by auditor
* @param profitable 1 if @a exchange being larger than @a auditor is
- * profitable for the exchange for this operation,
+ * profitable for the exchange for this operation
+ * (and thus @a exchange being smaller than @ auditor
+ * representing a loss for the exchange);
* -1 if @a exchange being smaller than @a auditor is
- * profitable for the exchange, and 0 if it is unclear
+ * profitable for the exchange; and 0 if it is unclear
*/
static void
report_amount_arithmetic_inconsistency (
@@ -1071,7 +1073,6 @@ refresh_session_cb (void *cls,
TALER_amount_add (&total_bad_sig_loss,
&total_bad_sig_loss,
amount_with_fee));
- return GNUNET_OK;
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1181,14 +1182,12 @@ refresh_session_cb (void *cls,
if (1 == TALER_amount_cmp (&refresh_cost,
&amount_without_fee))
{
- /* refresh_cost > amount_without_fee */
- report_amount_arithmetic_inconsistency ("melt (fee)",
+ /* refresh_cost > amount_without_fee, which is bad (exchange lost) */
+ report_amount_arithmetic_inconsistency ("melt (cost)",
rowid,
- &amount_without_fee,
- &refresh_cost,
- -1);
- GNUNET_free_non_null (reveal_ctx.new_issues);
- return GNUNET_OK;
+ &amount_without_fee, /*
'exchange' */
+ &refresh_cost, /* 'auditor' */
+ 1);
}
/* update outstanding denomination amounts for fresh coins withdrawn */
@@ -2222,7 +2221,7 @@ run (void *cls,
/* Tested in test-auditor.sh #4/#5/#6/#13/#26 */
"total_bad_sig_loss",
TALER_JSON_from_amount (&total_bad_sig_loss),
- /* FIXME: Tested in test-auditor.sh #?? */
+ /* Tested in test-auditor.sh #31 */
"row_inconsistencies",
report_row_inconsistencies,
/* Block #3 */
diff --git a/src/auditor/taler-helper-auditor-reserves.c
b/src/auditor/taler-helper-auditor-reserves.c
index 79439e01..8b3925c5 100644
--- a/src/auditor/taler-helper-auditor-reserves.c
+++ b/src/auditor/taler-helper-auditor-reserves.c
@@ -864,9 +864,16 @@ get_closing_fee (const char *receiver_account,
fee,
&master_sig))
{
+ char *diag;
+
+ GNUNET_asprintf (&diag,
+ "closing fee for `%s' unavailable at %s\n",
+ method,
+ GNUNET_STRINGS_absolute_time_to_string (atime));
report_row_inconsistency ("closing-fee",
atime.abs_value_us,
- "closing fee unavailable at given time");
+ diag);
+ GNUNET_free (diag);
GNUNET_free (method);
return GNUNET_SYSERR;
}
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 0d1fb67a..ccf31f08 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -9,7 +9,7 @@ set -eu
# Set of numbers for all the testcases.
# When adding new tests, increase the last number:
-ALL_TESTS=`seq 0 26`
+ALL_TESTS=`seq 0 31`
# $TESTS determines which tests we should run.
# This construction is used to make it easy to
@@ -1547,7 +1547,8 @@ then
# Obtain data to duplicate.
ID=`echo "SELECT id FROM app_banktransaction WHERE debit_account_id=2
LIMIT 1" | psql $DB -Aqt`
WTID=`echo "SELECT subject FROM app_banktransaction WHERE
debit_account_id=2 LIMIT 1" | psql $DB -Aqt`
- echo "INSERT INTO app_banktransaction
(amount,subject,date,credit_account_id,debit_account_id,cancelled) VALUES
('TESTKUDOS:1','$WTID',NOW(),12,2,'f')" | psql -Aqt $DB
+ UUID="992e8936-a64d-4845-87d7-021440330f8a"
+ echo "INSERT INTO app_banktransaction
(amount,subject,date,credit_account_id,debit_account_id,cancelled,request_uid)
VALUES ('TESTKUDOS:1','$WTID',NOW(),12,2,'f','$UUID')" | psql -Aqt $DB
audit_only
post_audit
@@ -1575,14 +1576,170 @@ fi
}
+
+
+# Test where denom_sig in known_coins table is wrong
+# (=> bad signature) AND the coin is used in aggregation
+function test_28() {
+# NOTE: This test is EXPECTED to fail for ~1h after
+# re-generating the test database as we do not
+# report lag of less than 1h (see GRACE_PERIOD in
+# taler-helper-auditor-wire.c)
+if [ $DATABASE_AGE -gt 3600 ]
+then
+
+ echo "===========28: known_coins signature wrong================="
+ # Modify denom_sig, so it is wrong
+ OLD_SIG=`echo 'SELECT denom_sig FROM known_coins LIMIT 1;' | psql $DB -Aqt`
+ COIN_PUB=`echo "SELECT coin_pub FROM known_coins WHERE
denom_sig='$OLD_SIG';" | psql $DB -Aqt`
+ echo "UPDATE known_coins SET
denom_sig='\x287369672d76616c200a2028727361200a2020287320233542383731423743393036444643303442424430453039353246413642464132463537303139374131313437353746324632323332394644443146324643333445393939413336363430334233413133324444464239413833353833464536354442374335434445304441453035374438363336434541423834463843323843344446304144363030343430413038353435363039373833434431333239393736423642433437313041324632414132414435413833303432434346314139464635394244434346
[...]
+
+ run_audit aggregator
+
+ ROW=`jq -e .bad_sig_losses[0].row < test-audit-aggregation.json`
+ if test $ROW != "1"
+ then
+ exit_fail "Row wrong, got $ROW"
+ fi
+
+ LOSS=`jq -r .bad_sig_losses[0].loss < test-audit-aggregation.json`
+ if test $LOSS == "TESTKUDOS:0"
+ then
+ exit_fail "Wrong deposit bad signature loss, got $LOSS"
+ fi
+
+ OP=`jq -r .bad_sig_losses[0].operation < test-audit-aggregation.json`
+ if test $OP != "wire"
+ then
+ exit_fail "Wrong operation, got $OP"
+ fi
+ TAB=`jq -r .row_inconsistencies[0].table < test-audit-aggregation.json`
+ if test $TAB != "deposit"
+ then
+ exit_fail "Wrong table for row inconsistency, got $TAB"
+ fi
+
+ LOSS=`jq -r .total_bad_sig_loss < test-audit-aggregation.json`
+ if test $LOSS == "TESTKUDOS:0"
+ then
+ exit_fail "Wrong total bad sig loss, got $LOSS"
+ fi
+
+ # cannot easily undo aggregator, hence full reload
+ full_reload
+
+else
+ echo "Test skipped (database too new)"
+fi
+}
+
+
+
+# Test where fees known to the auditor differ from those
+# accounted for by the exchange
+function test_29() {
+echo "===========29: withdraw fee inconsistency ================="
+
+echo "UPDATE auditor_denominations SET fee_withdraw_frac=5000000 WHERE
coin_val=1;" | psql -Aqt $DB
+
+run_audit
+
+AMOUNT=`jq -r .total_balance_summary_delta_plus < test-audit-reserves.json`
+if test "x$AMOUNT" == "xTESTKUDOS:0"
+then
+ exit_fail "Reported total amount wrong: $AMOUNT"
+fi
+
+PROFIT=`jq -r .amount_arithmetic_inconsistencies[0].profitable <
test-audit-coins.json`
+if test "x$PROFIT" != "x-1"
+then
+ exit_fail "Reported wrong profitability: $PROFIT"
+fi
+
+# Undo
+echo "UPDATE auditor_denominations SET fee_withdraw_frac=2000000 WHERE
coin_val=1;" | psql -Aqt $DB
+
+}
+
+
+# Test where fees known to the auditor differ from those
+# accounted for by the exchange
+function test_30() {
+echo "===========30: melt fee inconsistency ================="
+
+echo "UPDATE auditor_denominations SET fee_refresh_frac=5000000 WHERE
coin_val=10;" | psql -Aqt $DB
+
+run_audit
+
+AMOUNT=`jq -r .bad_sig_losses[0].loss < test-audit-coins.json`
+if test "x$AMOUNT" == "xTESTKUDOS:0"
+then
+ exit_fail "Reported total amount wrong: $AMOUNT"
+fi
+
+PROFIT=`jq -r .amount_arithmetic_inconsistencies[0].profitable <
test-audit-coins.json`
+if test "x$PROFIT" != "x-1"
+then
+ exit_fail "Reported profitability wrong: $PROFIT"
+fi
+
+jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail
"Unexpected emergency detected in ordinary run"
+
+# Undo
+echo "UPDATE auditor_denominations SET fee_refresh_frac=3000000 WHERE
coin_val=1;" | psql -Aqt $DB
+
+}
+
+
+# Test where fees known to the auditor differ from those
+# accounted for by the exchange
+function test_31() {
+
+# NOTE: This test is EXPECTED to fail for ~1h after
+# re-generating the test database as we do not
+# report lag of less than 1h (see GRACE_PERIOD in
+# taler-helper-auditor-wire.c)
+if [ $DATABASE_AGE -gt 3600 ]
+then
+
+ echo "===========31: deposit fee inconsistency ================="
+
+ echo "UPDATE auditor_denominations SET fee_deposit_frac=5000000 WHERE
coin_val=8;" | psql -Aqt $DB
+
+ run_audit aggregation
+
+ AMOUNT=`jq -r .total_bad_sig_loss < test-audit-coins.json`
+ if test "x$AMOUNT" == "xTESTKUDOS:0"
+ then
+ exit_fail "Reported total amount wrong: $AMOUNT"
+ fi
+
+ OP=`jq -r .bad_sig_losses[0].operation < test-audit-coins.json`
+ if test "x$OP" == "xdeposit"
+ then
+ exit_fail "Reported wrong operation: $OP"
+ fi
+
+ # Undo
+ echo "UPDATE auditor_denominations SET fee_deposit_frac=2000000 WHERE
coin_val=8;" | psql -Aqt $DB
+
+else
+ echo "Test skipped (database too new)"
+fi
+
+}
+
+
+
+# Test where fees known to the auditor differ from those
+# accounted for by the exchange
+function test_32() {
+ echo "not implemented"
+}
+
+
# **************************************************
# TODO: Add tests for revocation (payback, accepting of coins despite
revocation) HERE! #6053
-#
-# Test detection of fee structure inconsistencies
-# for denomination/wire fees (ADB vs. EDB tables!)
-#
-# Missing test for 'bad signature loss' detected by auditor-aggregation.
-#
# **************************************************
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-exchange] branch master updated (240b2368 -> dff81f45),
gnunet <=