From 3161751eba72d62d062cfc4f6e1eee5f2bbece59 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 14 Aug 2020 16:44:08 +0530 Subject: don't run old integrationtest command --- src/auditor/generate-auditor-basedb.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index b75112e6..7f7969e6 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -130,7 +130,6 @@ 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 ' -- cgit v1.2.3 From 96878561a524c2f7c12b0b35a13adce1c4112aed Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 14 Aug 2020 16:49:17 +0530 Subject: fix test withdrawal wallet invocation --- contrib/gana | 2 +- src/auditor/generate-revoke-basedb.sh | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/contrib/gana b/contrib/gana index 24fa8dad..f45d064d 160000 --- a/contrib/gana +++ b/contrib/gana @@ -1 +1 @@ -Subproject commit 24fa8dad8605b495efc1daa3d7189e2783110a34 +Subproject commit f45d064d7986be3cac550761fa95fb3fdd89dab1 diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh index fda76857..50cfb6ab 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: $BANK_URL, + }' \ + --arg BANK_URL $BANK_URL \ + --arg EXCHANGE_URL $EXCHANGE_URL + )" export coins=$(taler-wallet-cli --wallet-db=$WALLET_DB advanced dump-coins) -- cgit v1.2.3 From e4f98e0fa7336cd354f4689e7568d78421c2d76c Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 14 Aug 2020 16:52:29 +0530 Subject: exchange, not bank --- src/auditor/generate-revoke-basedb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh index 50cfb6ab..5ec1f5ca 100755 --- a/src/auditor/generate-revoke-basedb.sh +++ b/src/auditor/generate-revoke-basedb.sh @@ -145,7 +145,7 @@ taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'withdrawTestBalance' { amount: "TESTKUDOS:8", bankBaseUrl: $BANK_URL, - exchangeBaseUrl: $BANK_URL, + exchangeBaseUrl: $EXCHANGE_URL, }' \ --arg BANK_URL $BANK_URL \ --arg EXCHANGE_URL $EXCHANGE_URL -- cgit v1.2.3 From 645fef07cb91eaf4f02024bbc898b32f681c55f3 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 14 Aug 2020 17:12:35 +0530 Subject: spend 4 TESTKUDOS, not 5, like the previous test command --- src/auditor/generate-auditor-basedb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index 7f7969e6..5b4f21fe 100755 --- a/src/auditor/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh @@ -134,7 +134,7 @@ echo "Running wallet" 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, -- cgit v1.2.3