exchange

commit 62a53f836bf3eaba1e796ade47259457e2b60f15
parent d8256207a12ba665fbd2a6fb1ea0dc942530d318
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 14 Aug 2020 14:43:03 +0200

Merge branch 'master' of git+ssh://git.taler.net/exchange

Diffstat:
M
src/auditor/generate-auditor-basedb.sh
 | 
3
+--
M
src/auditor/generate-revoke-basedb.sh
 | 
16
+++++++++++-----

2 files changed, 12 insertions(+), 7 deletions(-)
diff --git 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
@@ -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)