diff options
Diffstat (limited to 'src/testing/taler-unified-setup.sh')
| -rwxr-xr-x | src/testing/taler-unified-setup.sh | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh index b1c8402f5..e1fcc8015 100755 --- a/src/testing/taler-unified-setup.sh +++ b/src/testing/taler-unified-setup.sh @@ -77,6 +77,7 @@ START_TRANSFER=0 START_WIREWATCH=0 START_DEPOSITCHECK=0 START_MERCHANT_EXCHANGE=0 +START_MERCHANT_WIREWATCH=0 USE_ACCOUNT="exchange-account-1" USE_VALGRIND="" WIRE_DOMAIN="x-taler-bank" @@ -85,7 +86,7 @@ LOGLEVEL="DEBUG" DEFAULT_SLEEP="0.2" # Parse command-line options -while getopts ':abc:d:DeEfghkL:mMnr:stu:vwW' OPTION; do +while getopts ':abc:d:DeEfghkL:mMnr:stu:vwWz' OPTION; do case "$OPTION" in a) START_AUDITOR="1" @@ -125,6 +126,7 @@ while getopts ':abc:d:DeEfghkL:mMnr:stu:vwW' OPTION; do echo ' -f -- start fakebank' echo ' -g -- start taler-exchange-aggregator' echo ' -h -- print this help' + echo ' -k -- start challenger (KYC service)' # shellcheck disable=SC2016 echo ' -L $LOGLEVEL -- set log level' echo ' -m -- start taler-merchant' @@ -139,6 +141,7 @@ while getopts ':abc:d:DeEfghkL:mMnr:stu:vwW' OPTION; do echo ' -v -- use valgrind' echo ' -w -- start taler-exchange-wirewatch' echo ' -W -- wait for signal' + echo ' -z -- start taler-merchant-wirewatch' exit 0 ;; g) @@ -181,6 +184,9 @@ while getopts ':abc:d:DeEfghkL:mMnr:stu:vwW' OPTION; do W) WAIT_FOR_SIGNAL="1" ;; + z) + START_MERCHANT_WIREWATCH="1" + ;; ?) exit_fail "Unrecognized command line option" ;; @@ -265,7 +271,7 @@ register_bank_account() { ENAME=$(echo "$3" | sed -e "s/ /+/g") # Note: this assumes that $3 has no spaces. Should probably escape in the future.. PAYTO="payto://iban/SANDBOXX/${MAYBE_IBAN}?receiver-name=$ENAME" - BODY='{"username":"'"$1"'","password":"'"$2"'","is_taler_exchange":'"$IS_EXCHANGE"',"name":"'"$3"'","internal_payto_uri":"'"$PAYTO"'"}' + BODY='{"username":"'"$1"'","password":"'"$2"'","is_taler_exchange":'"$IS_EXCHANGE"',"name":"'"$3"'","payto_uri":"'"$PAYTO"'"}' else BODY='{"username":"'"$1"'","password":"'"$2"'","is_taler_exchange":'"$IS_EXCHANGE"',"name":"'"$3"'"}' fi @@ -568,19 +574,33 @@ then $USE_VALGRIND taler-merchant-webhook \ -c "$CONF" \ -L "$LOGLEVEL" 2> taler-merchant-webhook.log & + echo " DONE" + if [ "1" = "$START_MERCHANT_WIREWATCH" ] + then + echo -n "Starting taler-merchant-wirewatch ..." + $USE_VALGRIND taler-merchant-wirewatch \ + -c "$CONF" \ + -L "$LOGLEVEL" \ + --persist \ + 2> taler-merchant-wirewatch.log & + echo " DONE" + fi if [ "1" = "$START_MERCHANT_EXCHANGE" ] then + echo -n "Starting taler-merchant-exchange ..." $USE_VALGRIND taler-merchant-exchange \ -c "$CONF" \ -L "$LOGLEVEL" 2> taler-merchant-exchange.log & + echo " DONE" fi if [ "1" = "$START_DEPOSITCHECK" ] then + echo -n "Starting taler-merchant-depositcheck ..." $USE_VALGRIND taler-merchant-depositcheck \ -c "$CONF" \ -L "$LOGLEVEL" 2> taler-merchant-depositcheck.log & + echo " DONE" fi - echo " DONE" fi @@ -667,9 +687,9 @@ then $USE_VALGRIND taler-auditor-httpd \ -L "$LOGLEVEL" \ -c "$CONF" 2> taler-auditor-httpd.log & - $USE_VALGRIND taler-helper-auditor-deposits \ - -L "$LOGLEVEL" \ - -c "$CONF" 2> taler-helper-auditor.log & +# $USE_VALGRIND taler-helper-auditor-deposits \ +# -L "$LOGLEVEL" \ +# -c "$CONF" 2> taler-helper-auditor.log & echo " DONE" fi |