merchant

commit fc986912dab1078f145d52daca185e1222d6d430
parent b7ca30146d9d9e3e3da36f343f89aa100a0fd2bf
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Tue, 10 Nov 2015 20:18:46 +0100

Fixing the /deposit's cb triggering

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

3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/backend-lib/merchant_db.c b/src/backend-lib/merchant_db.c
@@ -265,6 +265,7 @@ MERCHANT_DB_update_deposit_permission (PGconn *conn,
   struct TALER_PQ_QueryParam params[] = {
     TALER_PQ_query_param_uint64 (&transaction_id),
     TALER_PQ_query_param_uint32 (&pending),
+    TALER_PQ_query_param_end  
   };
 
   res = TALER_PQ_exec_prepared (conn, "update_deposit_permission", params);
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -57,17 +57,9 @@ struct GNUNET_CRYPTO_EddsaPrivateKey *privkey;
  */
 char *keyfile;
 
-/**
-<<<<<<< HEAD
- * This value tells the mint by which date this merchant would like 
-=======
- * Mint context
- */
-static struct TALER_MINT_Context *mctx;
 
 /**
  * This value tells the mint by which date this merchant would like
->>>>>>> 4a6da71b506b52fa68873038882dd88333ff5308
  * to receive the funds for a deposited payment
  */
 struct GNUNET_TIME_Relative edate_delay;
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
@@ -126,6 +126,7 @@ deposit_cb (void *cls, unsigned int http_status, json_t *proof)
   struct MERCHANT_DepositConfirmationCls *dccls;
   dccls = (struct MERCHANT_DepositConfirmationCls *) cls;
 
+  printf ("deposit cb\n");
   if (GNUNET_SYSERR ==
       MERCHANT_DB_update_deposit_permission (db_conn,
                                              dccls->transaction_id,
@@ -421,8 +422,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
 
   printf ("poller task: %p\n", poller_task);
   GNUNET_SCHEDULER_cancel (poller_task);
-  GNUNET_SCHEDULER_add_now (context_task, NULL);
-  return MHD_YES;
+  GNUNET_SCHEDULER_add_now (context_task, mints[mint_index].ctx);
 
   /* 4 Return response code: success, or whatever data the
     mint sent back regarding some bad coin */