[taler-merchant] branch master updated: bugfixes

[gnunet]

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 bb6163e  bugfixes
bb6163e is described below

commit bb6163e9eda287af4947e0fd7e1f66a4e9809814
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Mar 1 18:01:08 2020 +0100

    bugfixes
---
 src/backend/taler-merchant-httpd_auditors.c       | 2 +-
 src/backend/taler-merchant-httpd_pay.c            | 4 +---
 src/backend/taler-merchant-httpd_track-transfer.c | 5 +++--
 src/lib/testing_api_cmd_check_payment.c           | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_auditors.c 
b/src/backend/taler-merchant-httpd_auditors.c
index 144db07..8373f15 100644
--- a/src/backend/taler-merchant-httpd_auditors.c
+++ b/src/backend/taler-merchant-httpd_auditors.c
@@ -110,7 +110,7 @@ TMH_AUDITORS_check_dk (struct TALER_EXCHANGE_Handle *mh,
                     TALER_B2S (&auditors[j].public_key));
 
       }
-      for (unsigned int k = 0; j<ai->num_denom_keys; k++)
+      for (unsigned int k = 0; k<ai->num_denom_keys; k++)
         if (&keys->denom_keys[k] == dk)
           return GNUNET_OK;
     }
diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index de00e87..1e1ac4c 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -2271,9 +2271,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
                           root,
                           pc);
   json_decref (root);
-  if (GNUNET_SYSERR == res)
-    return MHD_NO;
-  return MHD_YES;
+  return res;
 }
 
 
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c 
b/src/backend/taler-merchant-httpd_track-transfer.c
index 3ce7cc0..1dcafb9 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -687,7 +687,8 @@ wire_transfer_cb (void *cls,
    *
    * details_length is how many (Taler coin) deposits have been
    * aggregated into _this_ wire transfer.
-   */for (unsigned int i = 0; i<details_length; i++)
+   *///
+  for (unsigned int i = 0; i<details_length; i++)
   {
     rctx->current_offset = i;
     rctx->current_detail = &details[i];
@@ -703,7 +704,7 @@ wire_transfer_cb (void *cls,
     if (0 > qs)
     {
       /* single, read-only SQL statements should never cause
-   serialization problems */
+         serialization problems */
       GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs);
       /* Always report on hard error as well to enable diagnostics */
       GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
diff --git a/src/lib/testing_api_cmd_check_payment.c 
b/src/lib/testing_api_cmd_check_payment.c
index 816dd7f..bf4d545 100644
--- a/src/lib/testing_api_cmd_check_payment.c
+++ b/src/lib/testing_api_cmd_check_payment.c
@@ -63,7 +63,7 @@ struct CheckPaymentState
 
   /**
    * State for a /check-payment conclude CMD.
- */
+   */
   struct CheckPaymentConcludeState *cs;
 
   /**
@@ -264,7 +264,7 @@ check_payment_cb (void *cls,
     /* synchronous variant */
     if (paid != cps->expect_paid)
       TALER_TESTING_FAIL (cps->is);
-    if (cps->http_status != http_status)
+    if (cps->expected_http_status != http_status)
       TALER_TESTING_FAIL (cps->is);
     TALER_TESTING_interpreter_next (cps->is);
   }

-- 
To stop receiving notification emails like this one, please contact
address@hidden.