diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-01-17 23:27:40 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-01-17 23:27:40 +0100 |
commit | 4dc8092f83f5d54d1804a920cdb1863cc71c8d2b (patch) | |
tree | f65db7dea00cd33f94a374b479073e5820a7326b | |
parent | 96543f62ef21375b3b04fee7eb97ee28fe5268e0 (diff) | |
download | exchange-4dc8092f83f5d54d1804a920cdb1863cc71c8d2b.tar.gz exchange-4dc8092f83f5d54d1804a920cdb1863cc71c8d2b.tar.bz2 exchange-4dc8092f83f5d54d1804a920cdb1863cc71c8d2b.zip |
auditor fixes
-rw-r--r-- | contrib/auditor-report.tex.j2 | 8 | ||||
-rwxr-xr-x | src/auditor/test-auditor.sh | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/auditor-report.tex.j2 b/contrib/auditor-report.tex.j2 index cdcbc067f..e3db565e5 100644 --- a/contrib/auditor-report.tex.j2 +++ b/contrib/auditor-report.tex.j2 @@ -725,14 +725,14 @@ account. {\bf All incoming wire transfer sender accounts matched up.} {% else %} \begin{longtable}{p{8.5cm}|r} - {\bf Wire transfer identifier} & {\bf Amount} \\ + {\bf Reserve Public Key} & {\bf Amount} \\ \hline \hline \endfirsthead - {\bf Wire transfer identifier} & {\bf Amount} \\ + {\bf Reserve Public Key} & {\bf Amount} \\ \hline \hline \endhead \hline \hline - {\bf Wire transfer identifier} & {\bf Amount} \\ + {\bf Reserve Public Key} & {\bf Amount} \\ \endfoot \hline {\bf Total amount} & @@ -741,7 +741,7 @@ account. \label{table:wire_in:sender_account_inconsistencies} \endlastfoot {% for item in wire.missattribution_in_inconsistencies %} - {\tt \small \truncate{8.3cm}{ {{ item.wtid }} } } & + {\tt \small \truncate{8.3cm}{ {{ item.reserve_pub }} } } & {{ item.amount }} \\ \hline {% endfor %} \end{longtable} diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index f10718eec..8b1159b46 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -585,7 +585,7 @@ if test "x$DIAG" != "xwire subject does not match" then exit_fail "Diagnostic wrong: $DIAG (0)" fi -WTID=`jq -r .reserve_in_amount_inconsistencies[0].wtid < test-wire-audit.json` +WTID=`jq -r .reserve_in_amount_inconsistencies[0].reserve_pub < test-wire-audit.json` if test x$WTID != x"$OLD_WTID" -a x$WTID != x"$NEW_WTID" then exit_fail "WTID reported wrong: $WTID" @@ -604,10 +604,10 @@ if test "x$DIAG" != "xwire subject does not match" then exit_fail "Diagnostic wrong: $DIAG (1)" fi -WTID=`jq -r .reserve_in_amount_inconsistencies[1].wtid < test-wire-audit.json` +WTID=`jq -r .reserve_in_amount_inconsistencies[1].reserve_pub < test-wire-audit.json` if test $WTID != "$OLD_WTID" -a $WTID != "$NEW_WTID" then - exit_fail "WTID reported wrong: $WTID" + exit_fail "WTID reported wrong: $WTID (wanted: $NEW_WTID or $OLD_WTID)" fi EX_A=`jq -r .reserve_in_amount_inconsistencies[1].amount_exchange_expected < test-wire-audit.json` if test $WTID = "$OLD_WTID" -a $EX_A != "TESTKUDOS:10" |