integrate bank when generating auditor test database

src/benchmark/auditor-basedb.mpub

@@ -1 +1 @@
-QW2M39YPJ2P9MAGBVCF5BWJ0GTW41344DRTW7GA63732QQB2D0SG
+63MPTZ729J3SQXMEFA9QZR41VSYK7NHM0VG9KNJN402GG8ESPVX0

src/benchmark/generate-auditor-basedb.conf

@@ -38,7 +38,7 @@ AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
 SERVE = tcp
 UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
 UNIXPATH_MODE = 660
-PORT = 8082
+PORT = 8083
 
 [PATHS]
 TALER_HOME = ${PWD}/generate_auditordb_home/
@@ -49,9 +49,13 @@ TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-system-runtime/
 DEFAULTCONFIG = /home/grothoff/research/taler/exchange/src/benchmark/generate-auditor-basedb.conf
 
 [bank]
-DATABASE = postgres:///talerbank
-MAX_DEBT = KUDOS:50.0
-MAX_DEBT_BANK = KUDOS:0.0
+DATABASE = postgres:///taler-auditor-basedb
+MAX_DEBT = TESTKUDOS:50.0
+MAX_DEBT_BANK = TESTKUDOS:0.0
+HTTP_PORT = 8082
+SUGGESTED_EXCHANGE = http://localhost:8081/
+SUGGESTED_EXCHANGE_PAYTO = payto://x-taler-bank/localhost:8082/2
+
 
 [exchangedb]
 AUDITOR_BASE_DIR = ${TALER_DATA_HOME}/auditors/
@@ -70,7 +74,7 @@ CURRENCY = TESTKUDOS
 
 [account-1]
 WIRE_RESPONSE = ${TALER_DATA_HOME}/exchange/account-1.json
-url = payto://x-taler-bank/bank.test.taler.net/2
+url = payto://x-taler-bank/localhost:8082/2
 plugin = taler_bank
 enable_debit = yes
 enable_credit = yes
@@ -79,7 +83,7 @@ USERNAME = Exchange
 PASSWORD = x
 
 [account-merchant]
-URL = payto://x-taler-bank/bank.test.taler.net:8082/3
+URL = payto://x-taler-bank/localhost:8082/3
 WIRE_RESPONSE = ${TALER_CONFIG_HOME}/merchant/account-3.json
 PLUGIN = taler_bank
 TALER_BANK_AUTH_METHOD = basic

src/benchmark/generate-auditor-basedb.sh

@@ -38,6 +38,8 @@ MASTER_PUB=`gnunet-ecc -p $MASTER_PRIV_FILE`
 EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL`
 MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT`
 MERCHANT_URL=http://localhost:${MERCHANT_PORT}/
+BANK_PORT=`taler-config -c $CONF -s BANK -o HTTP_PORT`
+BANK_URL=http://localhost:${BANK_PORT}/
 AUDITOR_URL=http://localhost:8888/
 
 # patch configuration
@@ -46,6 +48,7 @@ taler-config -c $CONF -s EXCHANGE-DEFAULT -o MASTER_KEY -V $MASTER_PUB
 taler-config -c $CONF -s exchangedb-postgres -o CONFIG -V postgres:///$TARGET_DB
 taler-config -c $CONF -s auditordb-postgres -o CONFIG -V postgres:///$TARGET_DB
 taler-config -c $CONF -s merchantdb-postgres -o CONFIG -V postgres:///$TARGET_DB
+taler-config -c $CONF -s bank -o database -V postgres:///$TARGET_DB
 
 # setup exchange
 echo "Setting up exchange"
@@ -59,19 +62,18 @@ taler-auditor-dbinit -c $CONF
 taler-auditor-exchange -c $CONF -m $MASTER_PUB -u $EXCHANGE_URL
 taler-auditor-sign -c $CONF -u $AUDITOR_URL -r e2a.dat -o a2e.dat -m $MASTER_PUB
 
-# Check we have network
-echo "Testing network"
-ping -c1 bank.test.taler.net
-
 # Launch services
 echo "Launching services"
+taler-bank-manage -c $CONF serve-http &
 taler-exchange-httpd -c $CONF &
 taler-merchant-httpd -c $CONF &
 taler-exchange-wirewatch -c $CONF &
 
+sleep 10
+
 # run wallet CLI
 echo "Running wallet"
-taler-wallet-cli integrationtest -e $EXCHANGE_URL -m $MERCHANT_URL
+taler-wallet-cli integrationtest -e $EXCHANGE_URL -m $MERCHANT_URL -b $BANK_URL
 
 echo "Shutting down services"
 kill `jobs -p`