code clean up and get KYC test to pass again with recent exchange changes

1 files changed, 3 insertions, 46 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 37c7f56e..9b38c2bf 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -107,37 +107,6 @@ struct TALER_MERCHANT_HttpResponse
 
 
 /**
- * Take a @a response from the merchant API that (presumably) contains
- * error details and setup the corresponding @a hr structure.  Internally
- * used to convert merchant's responses in to @a hr.
- *
- * @param response if NULL we will report #TALER_EC_GENERIC_INVALID_RESPONSE in `ec`
- * @param http_status http status to use
- * @param[out] hr response object to initialize, fields will
- *        only be valid as long as @a response is valid as well
- */
-void
-TALER_MERCHANT_parse_error_details_ (const json_t *response,
-                                     unsigned int http_status,
-                                     struct TALER_MERCHANT_HttpResponse *hr);
-
-
-/**
- * Construct a new base URL using the existing @a base_url
- * and the given @a instance_id.  The result WILL end with
- * '/'.
- *
- * @param base_url a merchant base URL without "/instances/" in it,
- *         must not be the empty string; MAY end with '/'.
- * @param instance_id ID of an instance
- * @return "${base_url}/instances/${instance_id}/"
- */
-char *
-TALER_MERCHANT_baseurl_add_instance (const char *base_url,
-                                     const char *instance_id);
-
-
-/**
  * Contains information gathered from parsing a taler://pay URI.
  */
 struct TALER_MERCHANT_PayUriData
@@ -187,7 +156,7 @@ struct TALER_MERCHANT_PayUriData
  * @param[out] parse_data data extracted from the URI. Must be free'd.
  * @return #GNUNET_SYSERR if @e pay_uri is malformed, #GNUNET_OK otherwise.
  */
-int
+enum GNUNET_GenericReturnValue
 TALER_MERCHANT_parse_pay_uri (const char *pay_uri,
                               struct TALER_MERCHANT_PayUriData *parse_data);
 
@@ -4370,11 +4339,13 @@ void
 TALER_MERCHANT_template_delete_cancel (
   struct TALER_MERCHANT_TemplateDeleteHandle *tdh);
 
+
 /**
  * Make a POST /using-templates request to add an using template
  *
  * @param ctx the context
  * @param backend_url HTTP base URL for the backend
+ * @param template_id which template should be used
  * @param summary summary of the using template
  * @param amount to pay given by the customer
  * @param cb function to call with the backend's result
@@ -4401,20 +4372,6 @@ void
 TALER_MERCHANT_using_templates_post_cancel (
   struct TALER_MERCHANT_UsingTemplatesPostHandle *utph);
 
-/**
- * Function called when we're done processing the
- * HTTP POST /using-template request to create an order.
- *
- * @param cls the `struct TALER_MERCHANT_PostOrdersHandle or TALER_MERCHANT_UsingTemplatesPostHandle`
- * @param response_code HTTP response code, 0 on error
- * @param response response body, NULL if not JSON
- */
-void
-TALER_MERCHANT_handle_post_using_templates_create_order (void *cb_cls,
-                                                         TALER_MERCHANT_PostOrdersCallback cb,
-                                                         long response_code,
-                                                         const json_t *json);
-
 
 /* ********************* /webhooks *********************** */