aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------contrib/wallet-core0
-rw-r--r--src/backend/test.conf2
-rw-r--r--src/backenddb/test.conf2
-rw-r--r--src/merchant-tools/benchmark-common.conf4
-rw-r--r--src/merchant-tools/benchmark-cs.conf2
-rw-r--r--src/merchant-tools/benchmark-rsa.conf2
-rw-r--r--src/testing/test.conf2
-rw-r--r--src/testing/test_key_rotation.conf2
-rw-r--r--src/testing/test_kyc_api.conf2
-rw-r--r--src/testing/test_merchant_api.conf2
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1694019704bin32 -> 0 bytes
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/16946242041
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/16940197041
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1694624204bin32 -> 0 bytes
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/16940197041
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/16946242041
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/16940197041
-rw-r--r--src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1694624204bin32 -> 0 bytes
-rwxr-xr-xsrc/testing/test_merchant_order_autocleanup.sh4
-rwxr-xr-xsrc/testing/test_merchant_order_creation.sh4
-rwxr-xr-xsrc/testing/test_merchant_product_creation.sh4
-rwxr-xr-xsrc/testing/test_merchant_reserve_creation.sh6
-rwxr-xr-xsrc/testing/test_merchant_transfer_tracking.sh4
-rwxr-xr-xsrc/testing/test_merchant_wirewatch.sh9
-rw-r--r--src/testing/test_template.conf4
25 files changed, 28 insertions, 32 deletions
diff --git a/contrib/wallet-core b/contrib/wallet-core
-Subproject 9e2d95b39723a038eb714d723ac0910a5bf596e
+Subproject c5a3cd4c50676c49fa6c67cbdeb609101c38e76
diff --git a/src/backend/test.conf b/src/backend/test.conf
index 502d807a..5f6528e6 100644
--- a/src/backend/test.conf
+++ b/src/backend/test.conf
@@ -119,7 +119,7 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-exchange]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
WIRE_GATEWAY_AUTH_METHOD = NONE
diff --git a/src/backenddb/test.conf b/src/backenddb/test.conf
index 5dba6a6a..b3955d6f 100644
--- a/src/backenddb/test.conf
+++ b/src/backenddb/test.conf
@@ -119,7 +119,7 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-exchange]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
WIRE_GATEWAY_AUTH_METHOD = NONE
diff --git a/src/merchant-tools/benchmark-common.conf b/src/merchant-tools/benchmark-common.conf
index 261bd725..1f54127f 100644
--- a/src/merchant-tools/benchmark-common.conf
+++ b/src/merchant-tools/benchmark-common.conf
@@ -43,7 +43,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/"
# account-2 is suitable for libeufin
[exchange-account-2]
@@ -55,7 +55,7 @@ PAYTO_URI = payto://iban/SANDBOXX/DE033310?receiver-name=Exchange+Company
WIRE_GATEWAY_AUTH_METHOD = basic
USERNAME = exchange
PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:8082/facades/test-facade/taler-wire-gateway/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/exchange/taler-wire-gateway/"
# Trust local exchange for "EUR" currency
diff --git a/src/merchant-tools/benchmark-cs.conf b/src/merchant-tools/benchmark-cs.conf
index db44e4d1..7f660ad3 100644
--- a/src/merchant-tools/benchmark-cs.conf
+++ b/src/merchant-tools/benchmark-cs.conf
@@ -10,7 +10,7 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-test]
-WIRE_GATEWAY_URL = http://localhost:8082/Exchange/
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/Exchange/taler-wire-gateway/
WIRE_GATEWAY_AUTH_METHOD = "basic"
USERNAME = Exchange
PASSWORD = x
diff --git a/src/merchant-tools/benchmark-rsa.conf b/src/merchant-tools/benchmark-rsa.conf
index bd4a90cf..a6c1512e 100644
--- a/src/merchant-tools/benchmark-rsa.conf
+++ b/src/merchant-tools/benchmark-rsa.conf
@@ -10,7 +10,7 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-test]
-WIRE_GATEWAY_URL = http://localhost:8082/Exchange/
+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.conf b/src/testing/test.conf
index 1506d192..48b3791c 100644
--- a/src/testing/test.conf
+++ b/src/testing/test.conf
@@ -122,7 +122,7 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-exchange]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
WIRE_GATEWAY_AUTH_METHOD = NONE
diff --git a/src/testing/test_key_rotation.conf b/src/testing/test_key_rotation.conf
index 9e06992c..519c2263 100644
--- a/src/testing/test_key_rotation.conf
+++ b/src/testing/test_key_rotation.conf
@@ -90,7 +90,7 @@ enable_debit = yes
enable_credit = yes
[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/taler-wire-gateway/Exchange/"
+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_kyc_api.conf b/src/testing/test_kyc_api.conf
index 50195ae0..71484512 100644
--- a/src/testing/test_kyc_api.conf
+++ b/src/testing/test_kyc_api.conf
@@ -79,7 +79,7 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-exchange]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
WIRE_GATEWAY_AUTH_METHOD = NONE
diff --git a/src/testing/test_merchant_api.conf b/src/testing/test_merchant_api.conf
index 9a9c1297..2013fa60 100644
--- a/src/testing/test_merchant_api.conf
+++ b/src/testing/test_merchant_api.conf
@@ -47,5 +47,5 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-exchange]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
WIRE_GATEWAY_AUTH_METHOD = NONE
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1694019704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1694019704
deleted file mode 100644
index d94536a7..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1694019704
+++ /dev/null
Binary files differ
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1694624204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1694624204
deleted file mode 100644
index f3e427c2..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1694624204
+++ /dev/null
@@ -1 +0,0 @@
-1x0R*'7-"x$ \ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1694019704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1694019704
deleted file mode 100644
index 7cf6e5d3..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1694019704
+++ /dev/null
@@ -1 +0,0 @@
-$>ğ*-u@j5;nb .BU} \ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1694624204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1694624204
deleted file mode 100644
index 807b40d4..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1694624204
+++ /dev/null
Binary files differ
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1694019704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1694019704
deleted file mode 100644
index 4a48a060..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1694019704
+++ /dev/null
@@ -1 +0,0 @@
-6$#6,zW}0âm>) \ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1694624204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1694624204
deleted file mode 100644
index 71aa1c01..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1694624204
+++ /dev/null
@@ -1 +0,0 @@
-HNoUb3:m ȹ,b0 7 \ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1694019704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1694019704
deleted file mode 100644
index 52bea9db..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1694019704
+++ /dev/null
@@ -1 +0,0 @@
-y`m!BВ5z?b&bJ \ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1694624204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1694624204
deleted file mode 100644
index 8b833fe7..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1694624204
+++ /dev/null
Binary files differ
diff --git a/src/testing/test_merchant_order_autocleanup.sh b/src/testing/test_merchant_order_autocleanup.sh
index 60ee19e0..f3b53733 100755
--- a/src/testing/test_merchant_order_autocleanup.sh
+++ b/src/testing/test_merchant_order_autocleanup.sh
@@ -10,12 +10,12 @@ then
ACCOUNT="exchange-account-2"
WIRE_METHOD="x-taler-bank"
BANK_FLAGS="-f -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:8082/taler-bank-access/"
+ BANK_URL="http://localhost:8082/"
else
ACCOUNT="exchange-account-1"
WIRE_METHOD="iban"
BANK_FLAGS="-ns -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:18082/demobanks/default/access-api/"
+ BANK_URL="http://localhost:18082/"
fi
. setup.sh
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh
index f0355565..602aad36 100755
--- a/src/testing/test_merchant_order_creation.sh
+++ b/src/testing/test_merchant_order_creation.sh
@@ -15,11 +15,11 @@ if [ 1 = "$USE_FAKEBANK" ]
then
ACCOUNT="exchange-account-2"
BANK_FLAGS="-f -d x-taler-bank -u $ACCOUNT"
- BANK_URL="http://localhost:8082/taler-bank-access/"
+ BANK_URL="http://localhost:8082/"
else
ACCOUNT="exchange-account-1"
BANK_FLAGS="-ns -d iban -u $ACCOUNT"
- BANK_URL="http://localhost:18082/demobanks/default/access-api/"
+ BANK_URL="http://localhost:18082/"
fi
. setup.sh
diff --git a/src/testing/test_merchant_product_creation.sh b/src/testing/test_merchant_product_creation.sh
index 6da5efa2..c3661d0e 100755
--- a/src/testing/test_merchant_product_creation.sh
+++ b/src/testing/test_merchant_product_creation.sh
@@ -26,12 +26,12 @@ then
ACCOUNT="exchange-account-2"
WIRE_METHOD="x-taler-bank"
BANK_FLAGS="-f -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:8082/taler-bank-access/"
+ BANK_URL="http://localhost:8082/"
else
ACCOUNT="exchange-account-1"
WIRE_METHOD="iban"
BANK_FLAGS="-ns -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:18082/demobanks/default/access-api/"
+ BANK_URL="http://localhost:18082/"
fi
. setup.sh
diff --git a/src/testing/test_merchant_reserve_creation.sh b/src/testing/test_merchant_reserve_creation.sh
index 36e71e99..c910ba9c 100755
--- a/src/testing/test_merchant_reserve_creation.sh
+++ b/src/testing/test_merchant_reserve_creation.sh
@@ -26,12 +26,12 @@ then
ACCOUNT="exchange-account-2"
WIRE_METHOD="x-taler-bank"
BANK_FLAGS="-f -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:8082/taler-bank-access/"
+ BANK_URL="http://localhost:8082/"
else
ACCOUNT="exchange-account-1"
WIRE_METHOD="iban"
BANK_FLAGS="-ns -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:18082/demobanks/default/access-api/"
+ BANK_URL="http://localhost:18082/"
fi
. setup.sh
@@ -106,7 +106,7 @@ then
curl -X POST \
-d "$BODY" \
-s \
- http://localhost:8082/exchange/admin/add-incoming \
+ http://localhost:8082/accounts/exchange/taler-wire-gateway/admin/add-incoming \
> /dev/null
else
EXCHANGE_PAYTO=$(get_payto_uri exchange x)
diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh
index 3a2a18a9..55a8155d 100755
--- a/src/testing/test_merchant_transfer_tracking.sh
+++ b/src/testing/test_merchant_transfer_tracking.sh
@@ -27,12 +27,12 @@ then
ACCOUNT="exchange-account-2"
WIRE_METHOD="x-taler-bank"
BANK_FLAGS="-f -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:8082/taler-bank-access/"
+ BANK_URL="http://localhost:8082/"
else
ACCOUNT="exchange-account-1"
WIRE_METHOD="iban"
BANK_FLAGS="-ns -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:18082/demobanks/default/access-api/"
+ BANK_URL="http://localhost:18082/"
fi
. setup.sh
diff --git a/src/testing/test_merchant_wirewatch.sh b/src/testing/test_merchant_wirewatch.sh
index b4fdc66b..1eb7cb66 100755
--- a/src/testing/test_merchant_wirewatch.sh
+++ b/src/testing/test_merchant_wirewatch.sh
@@ -26,12 +26,12 @@ then
ACCOUNT="exchange-account-2"
WIRE_METHOD="x-taler-bank"
BANK_FLAGS="-f -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:8082/taler-bank-access/"
+ BANK_URL="http://localhost:8082/"
else
ACCOUNT="exchange-account-1"
WIRE_METHOD="iban"
BANK_FLAGS="-ns -d $WIRE_METHOD -u $ACCOUNT"
- BANK_URL="http://localhost:18082/demobanks/default/access-api/"
+ BANK_URL="http://localhost:18082/"
fi
. setup.sh
@@ -47,7 +47,7 @@ EXCHANGE_URL="http://localhost:8081/"
if [ 1 = "$USE_FAKEBANK" ]
then
- FACADE_URL="http://localhost:8082/anastasis-api/gnunet/"
+ FACADE_URL="http://localhost:8082/accounts/gnunet/taler-revenue/"
FACADE_USERNAME="gnunet"
FACADE_PASSWORD="x"
else
@@ -134,7 +134,8 @@ else
${NEXUS_ACCOUNT_NAME} \
&> nexus-new-facade.log
- FACADE_URL=$(libeufin-cli facades list | jq .facades[0].baseUrl | tr -d \")
+ FACADE_URL="http://localhost:18082/accounts/admin/taler-revenue/"
+ # WAS: $(libeufin-cli facades list | jq .facades[0].baseUrl | tr -d \")
# FIXME: is this correct? Strange to use the super-user
# credentials here!
diff --git a/src/testing/test_template.conf b/src/testing/test_template.conf
index 6aefabad..a45f966f 100644
--- a/src/testing/test_template.conf
+++ b/src/testing/test_template.conf
@@ -79,7 +79,7 @@ ENABLE_DEBIT = YES
ENABLE_CREDIT = YES
[exchange-accountcredentials-1]
-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
@@ -91,7 +91,7 @@ ENABLE_CREDIT = YES
[exchange-accountcredentials-2]
WIRE_GATEWAY_AUTH_METHOD = none
-WIRE_GATEWAY_URL = "http://localhost:8082/exchange/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/exchange/taler-wire-gateway/"
[merchant-exchange-default]
EXCHANGE_BASE_URL = http://localhost:8081/