diff options
| author | Florian Dold <florian.dold@gmail.com> | 2018-01-22 13:47:24 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2018-01-22 13:47:24 +0100 |
| commit | d66cae9aa61e710163c2385bee923988ec080a7a (patch) | |
| tree | fd32054af17cbbf95dd30c55027ee896ade30040 | |
| parent | 01ad0c0faf6c79e20a7c3914f9b95f7aa351eb8f (diff) | |
| download | merchant-d66cae9aa61e710163c2385bee923988ec080a7a.tar.gz merchant-d66cae9aa61e710163c2385bee923988ec080a7a.tar.bz2 merchant-d66cae9aa61e710163c2385bee923988ec080a7a.zip | |
should be find_order, not find_orders
| -rw-r--r-- | src/backend/taler-merchant-httpd_check-payment.c | 8 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_proposal.c | 16 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 14 | ||||
| -rw-r--r-- | 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 133471e2..7a24864c 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 53e169a3..e67a5cfe 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 57f11ec7..1a97670a 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 85cadd8a..ef613c17 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); |