[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: fix payto URIs in merchant tests
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: fix payto URIs in merchant tests |
Date: |
Wed, 21 Feb 2024 23:16:29 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 81380b9c fix payto URIs in merchant tests
81380b9c is described below
commit 81380b9ca15328ee66d622ba7089d4c2b9fb7025
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Feb 21 23:16:26 2024 +0100
fix payto URIs in merchant tests
---
contrib/wallet-core | 2 +-
doc/prebuilt | 2 +-
src/testing/test_merchant_api_twisted.c | 23 ++++++++++++++---------
src/testing/test_merchant_instance_auth.sh | 2 +-
src/testing/test_merchant_kyc.sh | 4 ++--
5 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/contrib/wallet-core b/contrib/wallet-core
index b160088e..ae088de5 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit b160088ea09cfda35e0e5c1e4c3ba0c58a2d0555
+Subproject commit ae088de54c086613a52cd6dd8d88f6535634c420
diff --git a/doc/prebuilt b/doc/prebuilt
index 60ccf04b..300a4693 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit 60ccf04bb3579c249a899c4ae88e120acda13c83
+Subproject commit 300a469342ba879b16ff93aaaf170fa1b88e75fb
diff --git a/src/testing/test_merchant_api_twisted.c
b/src/testing/test_merchant_api_twisted.c
index f7fb18d3..aa3b09b1 100644
--- a/src/testing/test_merchant_api_twisted.c
+++ b/src/testing/test_merchant_api_twisted.c
@@ -62,7 +62,7 @@ static char *config_file;
#define USER_ACCOUNT_NAME "62"
-#define PAYTO_I1 "payto://x-taler-bank/localhost/3"
+#define PAYTO_I1 "payto://x-taler-bank/localhost/3?receiver-name=user3"
/**
@@ -339,11 +339,11 @@ run (void *cls,
"default",
MHD_HTTP_NO_CONTENT),
TALER_TESTING_cmd_merchant_post_account (
- "instance-create-default-account",
- twister_merchant_url,
- PAYTO_I1,
- NULL, NULL,
- MHD_HTTP_OK),
+ "instance-create-default-account",
+ twister_merchant_url,
+ PAYTO_I1,
+ NULL, NULL,
+ MHD_HTTP_OK),
TALER_TESTING_cmd_batch ("pay",
pay),
/* Malform the response from the exchange. */
@@ -452,9 +452,14 @@ main (int argc,
cipher);
GNUNET_free (cipher);
}
- payer_payto = "payto://x-taler-bank/localhost/" USER_ACCOUNT_NAME;
- exchange_payto = "payto://x-taler-bank/localhost/" EXCHANGE_ACCOUNT_NAME;
- merchant_payto = "payto://x-taler-bank/localhost/" MERCHANT_ACCOUNT_NAME;
+ payer_payto =
+ "payto://x-taler-bank/localhost/" USER_ACCOUNT_NAME "?receiver-name=user";
+ exchange_payto =
+ "payto://x-taler-bank/localhost/" EXCHANGE_ACCOUNT_NAME
+ "?receiver-name=exchange";
+ merchant_payto =
+ "payto://x-taler-bank/localhost/" MERCHANT_ACCOUNT_NAME
+ "?receiver-name=merchant";
merchant_url = "http://localhost:8080/";
if (NULL == (twister_exchange_url = TALER_TWISTER_prepare_twister (
PROXY_EXCHANGE_config_file)))
diff --git a/src/testing/test_merchant_instance_auth.sh
b/src/testing/test_merchant_instance_auth.sh
index 1dea1368..85857b4f 100755
--- a/src/testing/test_merchant_instance_auth.sh
+++ b/src/testing/test_merchant_instance_auth.sh
@@ -52,7 +52,7 @@ fi
STATUS=$(curl -H "Content-Type: application/json" -X POST \
-H 'Authorization: Bearer secret-token:new_value' \
http://localhost:9966/private/accounts \
- -d '{"payto_uri":"payto://x-taler-bank/localhost:8082/43"}' \
+ -d
'{"payto_uri":"payto://x-taler-bank/localhost:8082/43?receiver-name=user43"}' \
-w "%{http_code}" -s -o /dev/null)
diff --git a/src/testing/test_merchant_kyc.sh b/src/testing/test_merchant_kyc.sh
index 9eef6ca5..1c818c31 100755
--- a/src/testing/test_merchant_kyc.sh
+++ b/src/testing/test_merchant_kyc.sh
@@ -41,7 +41,7 @@ fi
STATUS=$(curl -H "Content-Type: application/json" -X POST \
-H 'Authorization: Bearer secret-token:super_secret' \
http://localhost:9966/private/accounts \
- -d '{"payto_uri":"payto://x-taler-bank/localhost:8082/43"}' \
+ -d
'{"payto_uri":"payto://x-taler-bank/localhost:8082/43?receiver-name=user43"}' \
-w "%{http_code}" -s -o /dev/null)
@@ -53,7 +53,7 @@ fi
STATUS=$(curl -H "Content-Type: application/json" -X POST \
-H 'Authorization: Bearer secret-token:super_secret' \
http://localhost:9966/private/accounts \
- -d '{"payto_uri":"payto://x-taler-bank/localhost:8082/44"}' \
+ -d
'{"payto_uri":"payto://x-taler-bank/localhost:8082/44?receiver-name=user44"}' \
-w "%{http_code}" -s -o /dev/null)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: fix payto URIs in merchant tests,
gnunet <=