merchant

commit 22ba70b543717aa6d91ca4a44bd731b4a3bfc4f9
parent 47223238c240493887e1222ef76950e60871e84f
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 25 Nov 2015 21:31:40 +0100

simplify code as planned

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
4
+++-
M
src/backend/taler-merchant-httpd_pay.c
 | 
4
+---

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -248,6 +248,8 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     TALER_MERCHANTDB_disconnect (db_conn);
     db_conn = NULL;
   }
+  TMH_MINTS_done ();
+  TMH_AUDITORS_done ();
   if (NULL != keyfile)
     GNUNET_free (privkey);
 }
@@ -486,7 +488,7 @@ run (void *cls,
                                   &do_shutdown,
                                   NULL);
   EXITIF (GNUNET_SYSERR ==
-          TMH_MINTS_parse_cfg (config));
+          TMH_MINTS_init (config));
   EXITIF (GNUNET_SYSERR ==
           TMH_AUDITORS_init (config));
   /* FIXME: for now, we just support SEPA here: */
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
@@ -313,12 +313,10 @@ pay_context_cleanup (struct TM_HandlerContext *hc)
  * Function called with the result of our mint lookup.
  *
  * @param cls the `struct PayContext`
- * @param mint NULL if mint was not found to be acceptable
  * @param mh NULL if mint was not found to be acceptable
  */
 static void
 process_pay_with_mint (void *cls,
-                       struct MERCHANT_Mint *mint,
                        struct TALER_MINT_Handle *mh)
 {
   struct PayContext *pc = cls;
@@ -327,7 +325,7 @@ process_pay_with_mint (void *cls,
   const struct TALER_MINT_Keys *keys;
   unsigned int i;
 
-  if (NULL == mint)
+  if (NULL == mh)
   {
     /* The mint on offer is not in the set of our (trusted)
        mints.  Reject the payment. */