diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-08-14 14:43:03 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-08-14 14:43:03 +0200 |
commit | 62a53f836bf3eaba1e796ade47259457e2b60f15 (patch) | |
tree | 7aff830d0005c9dfd8e33b6e8f96483f41383f63 | |
parent | d8256207a12ba665fbd2a6fb1ea0dc942530d318 (diff) | |
parent | 645fef07cb91eaf4f02024bbc898b32f681c55f3 (diff) | |
download | exchange-62a53f836bf3eaba1e796ade47259457e2b60f15.tar.xz |
Merge branch 'master' of git+ssh://git.taler.net/exchange
m--------- | contrib/gana | 0 | ||||
-rwxr-xr-x | src/auditor/generate-auditor-basedb.sh | 3 | ||||
-rwxr-xr-x | src/auditor/generate-revoke-basedb.sh | 16 |
3 files changed, 12 insertions, 7 deletions
diff --git a/contrib/gana b/contrib/gana -Subproject 24fa8dad8605b495efc1daa3d7189e2783110a3 +Subproject f45d064d7986be3cac550761fa95fb3fdd89dab diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index b75112e60..5b4f21fe9 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -130,12 +130,11 @@ echo " DONE" # run wallet CLI echo "Running wallet" -taler-wallet-cli testing integrationtest -e $EXCHANGE_URL -m $MERCHANT_URL -b $BANK_URL taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'runIntegrationTest' \ "$(jq -n ' { - amountToSpend: "TESTKUDOS:5", + amountToSpend: "TESTKUDOS:4", amountToWithdraw: "TESTKUDOS:10", bankBaseUrl: $BANK_URL, exchangeBaseUrl: $EXCHANGE_URL, diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh index fda768574..5ec1f5ca6 100755 --- a/src/auditor/generate-revoke-basedb.sh +++ b/src/auditor/generate-revoke-basedb.sh @@ -139,11 +139,17 @@ echo " DONE" # run wallet CLI echo "Running wallet" -taler-wallet-cli --wallet-db=$WALLET_DB --no-throttle \ - testing withdraw \ - -e $EXCHANGE_URL \ - -b $BANK_URL \ - -a TESTKUDOS:8 + +taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'withdrawTestBalance' \ + "$(jq -n ' + { + amount: "TESTKUDOS:8", + bankBaseUrl: $BANK_URL, + exchangeBaseUrl: $EXCHANGE_URL, + }' \ + --arg BANK_URL $BANK_URL \ + --arg EXCHANGE_URL $EXCHANGE_URL + )" export coins=$(taler-wallet-cli --wallet-db=$WALLET_DB advanced dump-coins) |