merchant

commit d99be82b37fc00dec9b16822e815216c979d70cd
parent d2c40f4e19350efe134aab9be0f8be8f6a5d7bf8
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 18 Jan 2021 11:40:39 +0100

only log things as ERROR that are actually ERRORs

Diffstat:
M
src/backend/taler-merchant-httpd_private-post-orders.c
 | 
2
+-
M
src/lib/merchant_api_get_orders.c
 | 
4
++++
M
src/testing/testing_api_cmd_post_orders.c
 | 
7
+++++--

3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -984,7 +984,7 @@ add_payment_details (struct MHD_Connection *connection,
     wm = NULL;
   if (NULL == wm)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "No wire method available for instance '%s'\n",
                 hc->instance->settings.id);
     return TALER_MHD_reply_with_error (connection,
diff --git a/src/lib/merchant_api_get_orders.c b/src/lib/merchant_api_get_orders.c
@@ -192,6 +192,10 @@ handle_get_orders_finished (void *cls,
       GNUNET_JSON_parse_free (spec);
       break;
     }
+  case MHD_HTTP_NOT_FOUND:
+    hr.ec = TALER_JSON_get_error_code (json);
+    hr.hint = TALER_JSON_get_error_hint (json);
+    break;
   default:
     /* unexpected response code */
     hr.ec = TALER_JSON_get_error_code (json);
diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c
@@ -286,7 +286,7 @@ order_cb (void *cls,
       const struct TALER_TESTING_Command *order_cmd;
       const struct TALER_ClaimTokenP *prev_token;
       struct TALER_ClaimTokenP zero_token = {0};
-      
+
       order_cmd = TALER_TESTING_interpreter_lookup_command (
         ps->is,
         ps->duplicate_of);
@@ -312,6 +312,9 @@ order_cb (void *cls,
       }
     }
     break;
+  case MHD_HTTP_NOT_FOUND:
+    TALER_TESTING_interpreter_next (ps->is);
+    return;
   case MHD_HTTP_GONE:
     TALER_TESTING_interpreter_next (ps->is);
     return;
@@ -385,7 +388,7 @@ orders_run (void *cls,
   }
 
   if (NULL == json_object_get (order,
-                               "order_id")) 
+                               "order_id"))
   {
     struct GNUNET_TIME_Absolute now;
     char *order_id;