merchant

commit fcedf4bd8f5200400a6081940e8e38b899c6e3f4
parent 092b003a090bb5cdbe00e55eaa49ea00027e28d9
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Mon,  5 Dec 2016 11:09:06 +0100

Fix track-transfer conflict error JSON packaging

Diffstat:
M
src/backend/taler-merchant-httpd_track-transfer.c
 | 
3
++-
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
1
+

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -237,7 +237,7 @@ check_transfer (void *cls,
     rctx->check_transfer_result = GNUNET_SYSERR;
     /* Build the `TrackTransferConflictDetails` */
     rctx->response
-      = TMH_RESPONSE_make_json_pack ("{s:s, s:O, s:I, s:O, s:o, s:I, s:o, s:o}",
+      = TMH_RESPONSE_make_json_pack ("{s:I, s:s, s:o, s:I, s:o, s:o, s:I, s:o, s:o}",
                                      "code", (json_int_t) TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
                                      "hint", "disagreement about deposit valuation",
                                      "exchange_deposit_proof", exchange_proof,
@@ -570,6 +570,7 @@ MH_handler_track_transfer (struct TMH_RequestHandler *rh,
                                               "instance");
   if (NULL == instance_str)
     instance_str = "default";
+
   rctx->mi = TMH_lookup_instance (instance_str);
   if (NULL == rctx->mi)
     return TMH_RESPONSE_reply_not_found (connection,
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -878,6 +878,7 @@ postgres_find_payments_by_id_and_coin (void *cls,
     GNUNET_PQ_query_param_auto_from_type (coin_pub),
     GNUNET_PQ_query_param_end
   };
+
   result = GNUNET_PQ_exec_prepared (pg->conn,
                                     "find_deposits_by_tid_and_coin",
                                     params);