[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 06/07: pull
From: |
gnunet |
Subject: |
[taler-merchant] 06/07: pull |
Date: |
Wed, 29 Mar 2023 16:39:53 +0200 |
This is an automated email from the git hooks/post-receive script.
priscilla-huang pushed a commit to branch master
in repository merchant.
commit 8e104cfe8a419099e36a8c992f5523e2f0852aee
Author: priscilla <priscilla.huang@efrei.net>
AuthorDate: Wed Mar 29 10:09:28 2023 -0400
pull
---
src/testing/testing_api_cmd_get_template.c | 32 +++++-------------------------
1 file changed, 5 insertions(+), 27 deletions(-)
diff --git a/src/testing/testing_api_cmd_get_template.c
b/src/testing/testing_api_cmd_get_template.c
index 412c52c0..3866d6fa 100644
--- a/src/testing/testing_api_cmd_get_template.c
+++ b/src/testing/testing_api_cmd_get_template.c
@@ -115,47 +115,25 @@ get_template_cb (void *cls,
}
{
const char **expected_pos_key;
- const char *pos_key = tgr->details.success.pos_key;
if (GNUNET_OK !=
TALER_TESTING_get_trait_template_pos_key (template_cmd,
&expected_pos_key))
TALER_TESTING_interpreter_fail (gis->is);
- if ( ( (NULL == pos_key) && (NULL != *expected_pos_key)) ||
- ( (NULL != pos_key) && (NULL == *expected_pos_key)) ||
- ( (NULL != pos_key) &&
- (0 != strcmp (pos_key,
+ if ( ( (NULL == tgr->details.success.pos_key) && (NULL !=
*expected_pos_key)) ||
+ ( (NULL != tgr->details.success.pos_key) && (NULL ==
*expected_pos_key)) ||
+ ( (NULL != tgr->details.success.pos_key) &&
+ (0 != strcmp (tgr->details.success.pos_key,
*expected_pos_key)) ) )
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Template pos_key `%s' does not match `%s'\n",
- pos_key,
+ tgr->details.success.pos_key,
*expected_pos_key);
TALER_TESTING_interpreter_fail (gis->is);
return;
}
}
- {
- const enum TALER_MerchantConfirmationAlgorithm *expected_pos_alg;
- const enum TALER_MerchantConfirmationAlgorithm pos_alg =
tgr->details.success.pos_alg;
-
- if (GNUNET_OK !=
- TALER_TESTING_get_trait_template_pos_alg (template_cmd,
- &expected_pos_alg))
- TALER_TESTING_interpreter_fail (gis->is);
- if ( ( (0 == pos_alg) && (0 != *expected_pos_alg)) ||
- ( (0 != pos_alg) && (0 == *expected_pos_alg)) ||
- ( (0 != pos_alg) &&
- (pos_alg != *expected_pos_alg)) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Template pos_alg `%d' does not match `%d'\n",
- pos_alg,
- *expected_pos_alg);
- TALER_TESTING_interpreter_fail (gis->is);
- return;
- }
- }
{
const json_t *expected_template_contract;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] branch master updated (3fa7d3be -> 4e207441), gnunet, 2023/03/29
- [taler-merchant] 02/07: update of the test TOTP but not finish, gnunet, 2023/03/29
- [taler-merchant] 07/07: update pay order / using templates for test case totp, gnunet, 2023/03/29
- [taler-merchant] 03/07: update of the test TOTP but not finish, gnunet, 2023/03/29
- [taler-merchant] 01/07: daily pull, gnunet, 2023/03/29
- [taler-merchant] 05/07: pull, gnunet, 2023/03/29
- [taler-merchant] 04/07: pull, gnunet, 2023/03/29
- [taler-merchant] 06/07: pull,
gnunet <=