From 8fa6b996ed70bc4079b1b4f6b34bcda58a4094bd Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 26 Mar 2020 18:58:42 +0100 Subject: [PATCH] generating revocation test DB --- src/auditor/.gitignore | 1 + src/auditor/generate-revoke-basedb.sh | 20 +- src/auditor/revoke-basedb.age | 1 + src/auditor/revoke-basedb.fees | Bin 0 -> 600 bytes src/auditor/revoke-basedb.mpub | 1 + src/auditor/revoke-basedb.sql | 4888 +++++++++++++++++++++++++ 6 files changed, 4907 insertions(+), 4 deletions(-) create mode 100644 src/auditor/revoke-basedb.age create mode 100644 src/auditor/revoke-basedb.fees create mode 100644 src/auditor/revoke-basedb.mpub create mode 100644 src/auditor/revoke-basedb.sql diff --git a/src/auditor/.gitignore b/src/auditor/.gitignore index 4532fbe2b..021f9e795 100644 --- a/src/auditor/.gitignore +++ b/src/auditor/.gitignore @@ -14,3 +14,4 @@ taler-helper-auditor-coins taler-helper-auditor-deposits taler-helper-auditor-reserves taler-helper-auditor-wire +generate-auditor-basedb-prod.conf diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh index e0e28f15f..654d9a53a 100755 --- a/src/auditor/generate-revoke-basedb.sh +++ b/src/auditor/generate-revoke-basedb.sh @@ -94,6 +94,7 @@ taler-bank-manage-testing $CONF postgres:///$TARGET_DB serve-http &> revocation- taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log & EXCHANGE_PID=$! taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log & +MERCHANT_PID=$! taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log & taler-auditor-httpd -c $CONF 2> taler-auditor-httpd.log & @@ -246,15 +247,26 @@ taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB advanced suspend-coins "$sus taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB exchanges update \ -f $EXCHANGE_URL -# FIXME: wallet is broken... echo "Before Wallet CABOOM (type exit, note that you will have to terminate the wallet with CTRL-C)" -bash # Block until scheduled operations are done taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB run-until-done &> wallet-caboom.log -bash -# FIXME: check commands work from here... +echo "Restarting merchant (so new keys are known)" +kill -TERM $MERCHANT_PID +taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log & +MERCHANT_PID=$! +# Wait for merchant to be again available +for n in `seq 1 50` +do + echo -n "." + sleep 0.1 + OK=0 + # merchant + wget http://localhost:9966/ -o /dev/null -O /dev/null >/dev/null || continue + OK=1 + break +done # Now we buy something, only the coins resulting from recoup+refresh will be # used, as other ones are suspended diff --git a/src/auditor/revoke-basedb.age b/src/auditor/revoke-basedb.age new file mode 100644 index 000000000..9be1bef5d --- /dev/null +++ b/src/auditor/revoke-basedb.age @@ -0,0 +1 @@ +1585243926 diff --git a/src/auditor/revoke-basedb.fees b/src/auditor/revoke-basedb.fees new file mode 100644 index 0000000000000000000000000000000000000000..af37a805b34901980411e03dc69aae0e9a54003b GIT binary patch literal 600 zcmZQzVCZ0AU}5>mIVF8>hhJN}Xyh`jdgW~|%Jy@38JJ5<+$uEZi3_jIKK1pF+b_@7 zd2ur-YOh7B_zCGhy(>RG_;J!*`hV&QrcDg2v)Ny#&0%0*-F|9n;2j1y;CFHeaSaaf z4t4Plh6@52XyRAz+&M(Y) z%k_BIkDp5`xs0vve5ugivP7S&aPGU4|Ji{iQpq1s_p@H9R7~B2a50*D;Sy-#ZnqkK z&kH`tDKz8v