updates

1 files changed, 53 insertions, 53 deletions

diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 6304761f..ce76a6f2 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -258,12 +258,12 @@ build_deposits_response (void *cls,
   json_t *contract_terms;
   json_t *order_id;
 
-  db->preflight (db->cls);
+  TMH_db->preflight (TMH_db->cls);
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-      db->find_contract_terms_from_hash (db->cls,
-                                         &contract_terms,
-                                         key,
-                                         &rctx->mi->pubkey))
+      TMH_db->find_contract_terms_from_hash (TMH_db->cls,
+                                             &contract_terms,
+                                             key,
+                                             &rctx->mi->pubkey))
   {
     GNUNET_break_op (0);
     return GNUNET_NO;
@@ -541,16 +541,16 @@ check_wire_fee (struct TrackTransferContext *rctx,
   char *wire_method;
 
   wire_method = TALER_payto_get_method (rctx->payto_uri);
-  db->preflight (db->cls);
-  qs = db->lookup_wire_fee (db->cls,
-                            &rctx->master_pub,
-                            wire_method,
-                            execution_time,
-                            &expected_fee,
-                            &closing_fee,
-                            &start_date,
-                            &end_date,
-                            &master_sig);
+  TMH_db->preflight (TMH_db->cls);
+  qs = TMH_db->lookup_wire_fee (TMH_db->cls,
+                                &rctx->master_pub,
+                                wire_method,
+                                execution_time,
+                                &expected_fee,
+                                &closing_fee,
+                                &start_date,
+                                &end_date,
+                                &master_sig);
   if (0 >= qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -636,16 +636,16 @@ wire_transfer_cb (void *cls,
         "exchange_reply", hr->reply));
     return;
   }
-  db->preflight (db->cls);
-  qs = db->insert_transfer_details (db->cls,
-                                    rctx->exchange_url,
-                                    rctx->payto_uri,
-                                    &rctx->wtid,
-                                    total_amount,
-                                    wire_fee,
-                                    execution_time,
-                                    details_length,
-                                    details);
+  TMH_db->preflight (TMH_db->cls);
+  qs = TMH_db->insert_transfer_details (TMH_db->cls,
+                                        rctx->exchange_url,
+                                        rctx->payto_uri,
+                                        &rctx->wtid,
+                                        total_amount,
+                                        wire_fee,
+                                        execution_time,
+                                        details_length,
+                                        details);
   if (0 > qs)
   {
     /* Special report if retries insufficient */
@@ -685,13 +685,13 @@ wire_transfer_cb (void *cls,
     rctx->current_detail = &details[i];
     /* Set the coin as "never seen" before. */
     rctx->check_transfer_result = GNUNET_NO;
-    db->preflight (db->cls);
-    qs = db->find_payments_by_hash_and_coin (db->cls,
-                                             &details[i].h_contract_terms,
-                                             &rctx->mi->pubkey,
-                                             &details[i].coin_pub,
-                                             &check_transfer,
-                                             rctx);
+    TMH_db->preflight (TMH_db->cls);
+    qs = TMH_db->find_payments_by_hash_and_coin (TMH_db->cls,
+                                                 &details[i].h_contract_terms,
+                                                 &rctx->mi->pubkey,
+                                                 &details[i].coin_pub,
+                                                 &check_transfer,
+                                                 rctx);
     if (0 > qs)
     {
       /* single, read-only SQL statements should never cause
@@ -752,11 +752,11 @@ wire_transfer_cb (void *cls,
        remember it for future reference */
     for (unsigned int r = 0; r<MAX_RETRIES; r++)
     {
-      db->preflight (db->cls);
-      qs = db->store_coin_to_transfer (db->cls,
-                                       &details[i].h_contract_terms,
-                                       &details[i].coin_pub,
-                                       &rctx->wtid);
+      TMH_db->preflight (TMH_db->cls);
+      qs = TMH_db->store_coin_to_transfer (TMH_db->cls,
+                                           &details[i].h_contract_terms,
+                                           &details[i].coin_pub,
+                                           &rctx->wtid);
       if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
         break;
     }
@@ -918,7 +918,7 @@ handle_track_transfer_timeout (void *cls)
 
 
 /**
- * Manages a POST /private/transfers call. It calls the /track/wtid
+ * Manages a POST /private/transfers call. It calls the GET /transfers/$WTID
  * offered by the exchange in order to obtain the set of transfers
  * (of coins) associated with a given wire transfer.
  *
@@ -1015,16 +1015,16 @@ TMH_private_post_transfers (const struct TMH_RequestHandler *rh,
 
     deposit_sums = json_array ();
     GNUNET_assert (NULL != deposit_sums);
-    db->preflight (db->cls);
-    qs = db->lookup_transfer_details (db->cls,
-                                      rctx->exchange_url,
-                                      rctx->payto_uri,
-                                      &rctx->wtid,
-                                      &total_amount,
-                                      &wire_fee,
-                                      &execution_time,
-                                      &transfer_details_cb,
-                                      deposit_sums);
+    TMH_db->preflight (TMH_db->cls);
+    qs = TMH_db->lookup_transfer_details (TMH_db->cls,
+                                          rctx->exchange_url,
+                                          rctx->payto_uri,
+                                          &rctx->wtid,
+                                          &total_amount,
+                                          &wire_fee,
+                                          &execution_time,
+                                          &transfer_details_cb,
+                                          deposit_sums);
     if (0 > qs)
     {
       /* Simple select queries should not cause serialization issues */
@@ -1053,11 +1053,11 @@ TMH_private_post_transfers (const struct TMH_RequestHandler *rh,
 
   /* reply not in database, ensure the POST is in the database, and
      start work to obtain the reply from the exchange */
-  qs = db->insert_transfer (db->cls,
-                            rctx->exchange_url,
-                            &rctx->wtid,
-                            &rctx->amount,
-                            rctx->payto_uri);
+  qs = TMH_db->insert_transfer (TMH_db->cls,
+                                rctx->exchange_url,
+                                &rctx->wtid,
+                                &rctx->amount,
+                                rctx->payto_uri);
   if (0 > qs)
   {
     /* Simple select queries should not cause serialization issues */