migrate to new bank API

9 files changed, 16 insertions, 14 deletions

diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh
index e57fbc30a..eba903910 100755
--- a/src/testing/taler-unified-setup.sh
+++ b/src/testing/taler-unified-setup.sh
@@ -233,14 +233,16 @@ register_sandbox_account() {
 }
 
 register_fakebank_account() {
-    BODY='{"username":"'"$1"'","password":"'"$2"'"}'
+    # FIXME: may need to pass 'is_taler_exchange' here
+    # in the future to get exchange facade from libeufin!
+    BODY='{"username":"'"$1"'","password":"'"$2"'","name":"'"$1"'"}'
     wget \
         --post-data="$BODY" \
         --header='Content-type: application/json' \
         --tries=3 \
         --waitretry=1 \
         --timeout=30 \
-        "http://localhost:$BANK_PORT/taler-bank-access/testing/register" \
+        "http://localhost:$BANK_PORT/accounts" \
         -o /dev/null \
         -O /dev/null \
         >/dev/null
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf
index e9f7f4877..c9dcbf436 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -44,7 +44,7 @@ ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index a00aa97fd..79d0825fd 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -43,7 +43,7 @@ ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
diff --git a/src/testing/test_bank_api_fakebank.conf b/src/testing/test_bank_api_fakebank.conf
index ad7671d18..cd056c663 100644
--- a/src/testing/test_bank_api_fakebank.conf
+++ b/src/testing/test_bank_api_fakebank.conf
@@ -8,7 +8,7 @@ PAYTO_URI = "payto://x-taler-bank/localhost:8082/1?receiver-name=1"
 PAYTO_URI = "payto://x-taler-bank/localhost:8082/2?receiver-name=2"
 
 [exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
diff --git a/src/testing/test_bank_api_nexus.conf b/src/testing/test_bank_api_nexus.conf
index 5ca6808e9..e20a33a98 100644
--- a/src/testing/test_bank_api_nexus.conf
+++ b/src/testing/test_bank_api_nexus.conf
@@ -5,7 +5,7 @@
 PAYTO_URI = payto://iban/BIC/ES9121000418450200051332?receiver-name=Exchange
 
 [exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = http://localhost:8082/facades/test-facade/taler-wire-gateway/
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/exchange/taler-wire-gateway/
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = exchange
 PASSWORD = x
diff --git a/src/testing/test_bank_api_twisted.c b/src/testing/test_bank_api_twisted.c
index 3ac63a5fc..21ae56421 100644
--- a/src/testing/test_bank_api_twisted.c
+++ b/src/testing/test_bank_api_twisted.c
@@ -94,12 +94,12 @@ run (void *cls,
   {
   case TALER_TESTING_BS_FAKEBANK:
     exchange_auth_twisted.wire_gateway_url
-      = "http://localhost:8888/2/";
+      = "http://localhost:8888/accounts/2/taler-wire-gateway/";
     systype = "-f";
     break;
   case TALER_TESTING_BS_IBAN:
     exchange_auth_twisted.wire_gateway_url
-      = "http://localhost:8888/taler-wire-gateway/Exchange/";
+      = "http://localhost:8888/accounts/Exchange/taler-wire-gateway/";
     systype = "-ns";
     break;
   }
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index f24470418..ebd3d67a0 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -52,7 +52,7 @@ ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_AUTH_METHOD = none
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 
 [exchange-account-2]
 PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
@@ -63,7 +63,7 @@ ENABLE_CREDIT = YES
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 
 
 [kyc-provider-test-oauth2]
diff --git a/src/testing/test_exchange_api_age_restriction.conf b/src/testing/test_exchange_api_age_restriction.conf
index 12bf45c33..cd60781d4 100644
--- a/src/testing/test_exchange_api_age_restriction.conf
+++ b/src/testing/test_exchange_api_age_restriction.conf
@@ -52,7 +52,7 @@ ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_AUTH_METHOD = none
-WIRE_GATEWAY_URL = "http://localhost:8082/42/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/42/taler-wire-gateway/"
 
 [exchange-account-2]
 PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
@@ -63,7 +63,7 @@ ENABLE_CREDIT = YES
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 
 
 [kyc-provider-test-oauth2]
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf
index fafb747d1..56951c16c 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking.conf
@@ -32,7 +32,7 @@ ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:9082/42/"
+WIRE_GATEWAY_URL = "http://localhost:9082/accounts/42/taler-wire-gateway/"
 
 [exchange-account-2]
 PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
@@ -40,7 +40,7 @@ ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:9082/2/"
+WIRE_GATEWAY_URL = "http://localhost:9082/accounts/2/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x