[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 02/02: fix check for wire method existing (fixes test f
From: |
gnunet |
Subject: |
[taler-merchant] 02/02: fix check for wire method existing (fixes test failure) |
Date: |
Sun, 09 May 2021 12:13:52 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit c21919263c07c871d33478edc5b2430619870df0
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun May 9 11:26:37 2021 +0200
fix check for wire method existing (fixes test failure)
---
src/backend/taler-merchant-httpd_private-post-orders.c | 14 ++++----------
src/testing/test_merchant_api.c | 6 +++---
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c
b/src/backend/taler-merchant-httpd_private-post-orders.c
index deb888fc..0344079b 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -1024,17 +1024,11 @@ add_payment_details (struct MHD_Connection *connection,
wm = hc->instance->wm_head;
while ( (NULL != wm) &&
- (! wm->active) &&
- ( (NULL == payment_target) ||
- (0 != strcasecmp (payment_target,
- wm->wire_method) ) ) )
- {
+ ( (! wm->active) ||
+ ( (NULL != payment_target) &&
+ (0 != strcasecmp (payment_target,
+ wm->wire_method) ) ) ) )
wm = wm->next;
- }
-
- if ((NULL != wm) &&
- (GNUNET_YES != wm->active))
- wm = NULL;
if (NULL == wm)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
index 052b0c1d..797d2005 100644
--- a/src/testing/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
@@ -561,12 +561,12 @@ run (void *cls,
"order-p3",
GNUNET_TIME_UNIT_ZERO_ABS,
GNUNET_TIME_UNIT_FOREVER_ABS,
- true,
+ true, /* claim token */
"EUR:5.0",
"unsupported-wire-method",
"product-3/2",
- "",
- NULL),
+ "", /* locks */
+ NULL /* duplicate_of */),
TALER_TESTING_cmd_merchant_post_orders2 ("create-proposal-p3-pd-nx",
merchant_url,
MHD_HTTP_NOT_FOUND,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.