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

contrib/gana

@@ -1 +1 @@
-Subproject commit 24fa8dad8605b495efc1daa3d7189e2783110a34
+Subproject commit f45d064d7986be3cac550761fa95fb3fdd89dab1

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,

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)