merchant

commit a6bfe6b4640f01297798fb3ce16393a048da2259
parent 6e3cc9f70d5f23bf17a9cadaf306b35ffd9c6ed4
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 22 Sep 2023 09:18:26 +0200

adapt tests to new TWG

Diffstat:
M
src/testing/test_merchant_order_creation.sh
 | 
10
+++++-----
M
src/testing/test_merchant_transfer_tracking.sh
 | 
2
+-

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh
@@ -419,11 +419,11 @@ echo -n "Give time to Nexus to route the payment to Sandbox..."
 sleep 3
 echo " DONE"
 
-echo -n "Obtaining wire transfer details from bank..."
+echo -n "Obtaining wire transfer details from bank ($USE_FAKEBANK)..."
 
 if [ 1 = "$USE_FAKEBANK" ]
 then
-    BANKDATA="$(curl 'http://localhost:8082/exchange/history/outgoing?delta=1' -s)"
+    BANKDATA="$(curl 'http://localhost:8082/accounts/exchange/taler-wire-gateway/history/outgoing?delta=1' -s)"
     WTID=$(echo "$BANKDATA" | jq -r .outgoing_transactions[0].wtid)
     WURL=$(echo "$BANKDATA" | jq -r .outgoing_transactions[0].exchange_base_url)
     CREDIT_AMOUNT=$(echo "$BANKDATA" | jq -r .outgoing_transactions[0].amount)
@@ -445,7 +445,7 @@ fi
 
 if [ "$EXCHANGE_URL" != "$WURL" ]
 then
-    exit_fail "Wrong exchange URL in subject '$SUBJECT', expected '$EXCHANGE_URL'"
+    exit_fail "Wrong exchange URL in '$BANKDATA' response, expected '$EXCHANGE_URL'"
 fi
 
 echo " OK"
@@ -584,7 +584,7 @@ echo " OK"
 echo -n "Checking bank account status ..."
 if [ 1 = "$USE_FAKEBANK" ]
 then
-    STATUS=$(curl "http://localhost:8082/taler-bank-access/accounts/fortythree" \
+    STATUS=$(curl "http://localhost:8082/accounts/fortythree" \
                   -w "%{http_code}" \
                   -s \
                   -o "$LAST_RESPONSE")
@@ -603,7 +603,7 @@ else
     ACCOUNT_PASSWORD="fortythree:x"
     BANK_HOST="localhost:18082"
     # Can be replaced by the libeufin-cli way.
-    STATUS=$(curl "http://$ACCOUNT_PASSWORD@$BANK_HOST/demobanks/default/access-api/accounts/fortythree" \
+    STATUS=$(curl "http://$ACCOUNT_PASSWORD@$BANK_HOST/accounts/fortythree" \
                   -w "%{http_code}" -s -o "$LAST_RESPONSE")
     if [ "$STATUS" != "200" ]
     then
diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh
@@ -253,7 +253,7 @@ echo -n "Obtaining wire transfer details from bank..."
 
 if [ 1 = "$USE_FAKEBANK" ]
 then
-    BANKDATA="$(curl 'http://localhost:8082/exchange/history/outgoing?delta=1' -s)"
+    BANKDATA="$(curl 'http://localhost:8082/accounts/exchange/taler-wire-gateway/history/outgoing?delta=1' -s)"
     WTID=$(echo "$BANKDATA" | jq -r .outgoing_transactions[0].wtid)
     WURL=$(echo "$BANKDATA" | jq -r .outgoing_transactions[0].exchange_base_url)
     CREDIT_AMOUNT=$(echo "$BANKDATA" | jq -r .outgoing_transactions[0].amount)