From 581a39b5b5037d4e0419d8ce5448371a52499d80 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 28 Aug 2020 20:02:08 +0200 Subject: improve reporting, also use auditor fee calculation when computing reserve balance updates in case of disagreement on coin value/fee --- src/auditor/generate-auditor-basedb.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/auditor/generate-auditor-basedb.sh') diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index 1e5ea5c15..257b42eb3 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -45,6 +45,10 @@ TARGET_DB=taler-auditor-basedb WALLET_DB=${BASEDB:-"wallet"}.wdb +# delete existing wallet database +rm -f $WALLET_DB + + # Configuration file will be edited, so we create one # from the template. CONF=generate-auditor-basedb-prod.conf @@ -69,6 +73,7 @@ rm -rf $DATA_DIR || true dropdb $TARGET_DB >/dev/null 2>/dev/null || true createdb $TARGET_DB || exit_skip "Could not create database $TARGET_DB" + # obtain key configuration data MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE` MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE` @@ -141,7 +146,7 @@ fi # Setup merchant -curl -H "Content-Type: application/json" -X POST -d '{"payto_uris":["payto://x-taler-bank/localhost:8082/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_ms" : 3600000},"default_pay_delay":{"d_ms": 3600000}}' http://localhost:9966/private/instances +curl -H "Content-Type: application/json" -X POST -d '{"payto_uris":["payto://x-taler-bank/localhost/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_ms" : 3600000},"default_pay_delay":{"d_ms": 3600000}}' http://localhost:9966/private/instances echo " DONE" @@ -149,6 +154,7 @@ echo " DONE" # run wallet CLI echo "Running wallet" + taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'runIntegrationTest' \ "$(jq -n ' { -- cgit v1.2.3