[GNUnet-SVN] [taler-merchant] branch master updated: should be find_order, not find_orders

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new d66cae9  should be find_order, not find_orders
d66cae9 is described below

commit d66cae9aa61e710163c2385bee923988ec080a7a
Author: Florian Dold <address@hidden>
AuthorDate: Mon Jan 22 13:47:24 2018 +0100

    should be find_order, not find_orders
---
 src/backend/taler-merchant-httpd_check-payment.c |  8 ++++----
 src/backend/taler-merchant-httpd_proposal.c      | 16 ++++++++--------
 src/backenddb/plugin_merchantdb_postgres.c       | 14 +++++++-------
 src/include/taler_merchantdb_plugin.h            |  8 ++++----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_check-payment.c 
b/src/backend/taler-merchant-httpd_check-payment.c
index 133471e..7a24864 100644
--- a/src/backend/taler-merchant-httpd_check-payment.c
+++ b/src/backend/taler-merchant-httpd_check-payment.c
@@ -204,10 +204,10 @@ MH_handler_check_payment (struct TMH_RequestHandler *rh,
   }
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
   {
-    qs = db->find_orders (db->cls,
-                          &contract_terms,
-                          order_id,
-                          &mi->pubkey);
+    qs = db->find_order (db->cls,
+                         &contract_terms,
+                         order_id,
+                         &mi->pubkey);
     if (0 > qs)
     {
       /* single, read-only SQL statements should never cause
diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index 53e169a..e67a5cf 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -419,10 +419,10 @@ proposal_put (struct MHD_Connection *connection,
     json_t *dummy_contract_terms;
 
     dummy_contract_terms = NULL;
-    qs = db->find_orders (db->cls,
-                          &dummy_contract_terms,
-                          order_id,
-                          &mi->pubkey);
+    qs = db->find_order (db->cls,
+                         &dummy_contract_terms,
+                         order_id,
+                         &mi->pubkey);
     if (NULL != dummy_contract_terms)
       json_decref (dummy_contract_terms);
   }
@@ -612,10 +612,10 @@ MH_handler_proposal_lookup (struct TMH_RequestHandler *rh,
   }
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
   {
-    qs = db->find_orders (db->cls,
-                          &contract_terms,
-                          order_id,
-                          &mi->pubkey);
+    qs = db->find_order (db->cls,
+                         &contract_terms,
+                         order_id,
+                         &mi->pubkey);
     if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
     {
       return TMH_RESPONSE_reply_not_found (connection,
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 57f11ec..1a97670 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -408,7 +408,7 @@ postgres_initialize (void *cls)
                             " order_id=$1"
                             " AND merchant_pub=$2",
                             2),
-    GNUNET_PQ_make_prepare ("find_orders",
+    GNUNET_PQ_make_prepare ("find_order",
                             "SELECT"
                             " contract_terms"
                             " FROM merchant_orders"
@@ -871,10 +871,10 @@ postgres_find_contract_terms (void *cls,
  * @return transaction status
  */
 static enum GNUNET_DB_QueryStatus
-postgres_find_orders (void *cls,
-                      json_t **contract_terms,
-                      const char *order_id,
-                      const struct TALER_MerchantPublicKeyP *merchant_pub)
+postgres_find_order (void *cls,
+                     json_t **contract_terms,
+                     const char *order_id,
+                     const struct TALER_MerchantPublicKeyP *merchant_pub)
 {
   struct PostgresClosure *pg = cls;
 
@@ -896,7 +896,7 @@ postgres_find_orders (void *cls,
               TALER_B2S (merchant_pub));
   check_connection (pg);
   return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                  "find_orders",
+                                                  "find_order",
                                                   params,
                                                   rs);
 }
@@ -3357,7 +3357,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
   plugin->find_proof_by_wtid = &postgres_find_proof_by_wtid;
   plugin->insert_contract_terms = &postgres_insert_contract_terms;
   plugin->insert_order = &postgres_insert_order;
-  plugin->find_orders = &postgres_find_orders;
+  plugin->find_order = &postgres_find_order;
   plugin->find_contract_terms = &postgres_find_contract_terms;
   plugin->find_contract_terms_history = &postgres_find_contract_terms_history;
   plugin->find_contract_terms_by_date = &postgres_find_contract_terms_by_date;
diff --git a/src/include/taler_merchantdb_plugin.h 
b/src/include/taler_merchantdb_plugin.h
index 85cadd8..ef613c1 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -265,10 +265,10 @@ struct TALER_MERCHANTDB_Plugin
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*find_orders) (void *cls,
-                  json_t **contract_terms,
-                  const char *order_id,
-                  const struct TALER_MerchantPublicKeyP *merchant_pub);
+  (*find_order) (void *cls,
+                 json_t **contract_terms,
+                 const char *order_id,
+                 const struct TALER_MerchantPublicKeyP *merchant_pub);
 
 
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden