commit 2db154251cb9e358fccb6e7453ec4f8569a645e5 parent 28c230f3a099f3e4c478ffa3449cfd8f8d1d5e7b Author: Christian Grothoff <christian@grothoff.org> Date: Wed, 22 Jul 2026 03:40:14 +0200 merchantdb: update stale references to the pre-refactor names Diffstat:
92 files changed, 153 insertions(+), 153 deletions(-)
diff --git a/src/backend/taler-merchant-donaukeyupdate.c b/src/backend/taler-merchant-donaukeyupdate.c @@ -1005,7 +1005,7 @@ shutdown_task (void *cls) /** - * Callback function typically used by `select_donau_instances` to handle + * Callback function typically used by `iterate_donau_instances` to handle * the details of each Donau instance retrieved from the database. * * @param cls Closure to pass additional context or data to the callback function. diff --git a/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_delete-private-accounts-H_WIRE.c @@ -78,7 +78,7 @@ TMH_private_delete_account_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "inactivate_account"); + "update_to_account_inactive"); case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); return TALER_MHD_reply_with_error (connection, diff --git a/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_delete-private-otp-devices-DEVICE_ID.c @@ -52,13 +52,13 @@ TMH_private_delete_otp_devices_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "delete_otp"); + "delete_otp_device"); case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE, - "delete_otp (soft)"); + "delete_otp_device (soft)"); case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: return TALER_MHD_reply_with_error (connection, MHD_HTTP_NOT_FOUND, diff --git a/src/backend/taler-merchant-httpd_get-exchanges.c b/src/backend/taler-merchant-httpd_get-exchanges.c @@ -136,7 +136,7 @@ MH_handler_exchanges (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_exchanges"); + "iterate_exchanges"); } return TALER_MHD_REPLY_JSON_PACK ( connection, diff --git a/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_get-orders-ORDER_ID.c @@ -670,7 +670,7 @@ phase_lookup_terms (struct GetOrderData *god) phase_fail (god, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_contract_terms"); + "get_contract_terms"); return; } /* Note: when "!ord.requireClaimToken" and the client does not provide @@ -756,7 +756,7 @@ phase_lookup_terms (struct GetOrderData *god) phase_fail (god, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_order"); + "get_order"); return; } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) @@ -1216,7 +1216,7 @@ phase_check_paid (struct GetOrderData *god) phase_fail (god, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_order_status"); + "get_order_status"); return; } god->phase++; @@ -1468,7 +1468,7 @@ phase_check_refunded (struct GetOrderData *god) phase_fail (god, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_refunds_detailed"); + "iterate_refunds_detailed"); return false; } if (god->bad_refund_currency_in_db) diff --git a/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.c b/src/backend/taler-merchant-httpd_get-private-accounts-H_WIRE.c @@ -74,7 +74,7 @@ TMH_private_get_accounts_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_account"); + "get_account_serial"); } if (0 == qs) { diff --git a/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.c b/src/backend/taler-merchant-httpd_get-private-categories-CATEGORY_ID.c @@ -73,7 +73,7 @@ TMH_private_get_categories_ID ( return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_category"); + "get_category"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { diff --git a/src/backend/taler-merchant-httpd_get-private-groups.c b/src/backend/taler-merchant-httpd_get-private-groups.c @@ -111,7 +111,7 @@ TMH_private_get_groups (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_product_groups"); + "iterate_product_groups"); } } diff --git a/src/backend/taler-merchant-httpd_get-private-incoming-ID.c b/src/backend/taler-merchant-httpd_get-private-incoming-ID.c @@ -119,7 +119,7 @@ TMH_private_get_incoming_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_expected_transfer"); + "get_expected_transfer"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { @@ -160,7 +160,7 @@ TMH_private_get_incoming_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_wire_fee"); + "get_exchange_wire_fee"); } no_fee = (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs); if (! no_fee) @@ -192,7 +192,7 @@ TMH_private_get_incoming_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_reconciliation_details"); + "iterate_reconciliation_details"); } mret = TALER_MHD_REPLY_JSON_PACK ( diff --git a/src/backend/taler-merchant-httpd_get-private-incoming.c b/src/backend/taler-merchant-httpd_get-private-incoming.c @@ -182,7 +182,7 @@ TMH_private_get_incoming (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_expected_transfers"); + "iterate_expected_transfers"); } return TALER_MHD_REPLY_JSON_PACK ( connection, diff --git a/src/backend/taler-merchant-httpd_get-private-kyc.c b/src/backend/taler-merchant-httpd_get-private-kyc.c @@ -1261,7 +1261,7 @@ add_unreachable_status (void *cls, /** - * Function called from account_kyc_get_status() with KYC status information + * Function called from iterate_kyc_statuses() with KYC status information * for this merchant. * * @param cls our `struct KycContext *` @@ -1414,7 +1414,7 @@ phase_database_kyc_check (struct KycContext *kc) kc); kc->in_db = false; GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "account_kyc_get_status returned %d records\n", + "iterate_kyc_statuses returned %d records\n", (int) qs); switch (qs) { @@ -1426,7 +1426,7 @@ phase_database_kyc_check (struct KycContext *kc) TALER_MHD_reply_with_ec ( kc->connection, TALER_EC_GENERIC_DB_FETCH_FAILED, - "account_kyc_get_status")); + "iterate_kyc_statuses")); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: kc->phase = PHASE_NO_ACCOUNTS; diff --git a/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.c b/src/backend/taler-merchant-httpd_get-private-orders-ORDER_ID.c @@ -708,7 +708,7 @@ phase_fetch_contract (struct GetOrderRequestContext *gorc) &gorc->claim_token, &gorc->choice_index); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "lookup_contract_terms (%s) returned %d\n", + "get_contract_terms (%s) returned %d\n", hc->infix, (int) qs); if (0 > qs) diff --git a/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.c b/src/backend/taler-merchant-httpd_get-private-otp-devices-DEVICE_ID.c @@ -66,7 +66,7 @@ TMH_private_get_otp_devices_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_otp"); + "get_otp_device"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { diff --git a/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.c b/src/backend/taler-merchant-httpd_get-private-pots-POT_ID.c @@ -66,7 +66,7 @@ TMH_private_get_pot (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_money_pot"); + "get_money_pot"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { diff --git a/src/backend/taler-merchant-httpd_get-private-pots.c b/src/backend/taler-merchant-httpd_get-private-pots.c @@ -117,7 +117,7 @@ TMH_private_get_pots (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_money_pots"); + "iterate_money_pots"); } } return TALER_MHD_REPLY_JSON_PACK ( diff --git a/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.c b/src/backend/taler-merchant-httpd_get-private-products-PRODUCT_ID.c @@ -59,7 +59,7 @@ TMH_private_get_products_ID ( return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_product"); + "get_product"); } if (0 == qs) { diff --git a/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_get-private-reports-REPORT_ID.c @@ -83,7 +83,7 @@ TMH_private_get_report (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_report"); + "get_report"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { diff --git a/src/backend/taler-merchant-httpd_get-private-reports.c b/src/backend/taler-merchant-httpd_get-private-reports.c @@ -109,7 +109,7 @@ TMH_private_get_reports (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_reports"); + "iterate_reports"); } return TALER_MHD_REPLY_JSON_PACK ( diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.c b/src/backend/taler-merchant-httpd_get-private-statistics-amount-SLUG.c @@ -27,7 +27,7 @@ /** - * Typically called by `lookup_statistics_amount_by_bucket`. + * Typically called by `iterate_statistic_bucket_amounts`. * * @param cls a `json_t *` JSON array to build * @param description description of the statistic @@ -95,7 +95,7 @@ amount_by_bucket (void *cls, /** - * Typically called by `lookup_statistics_amount_by_interval`. + * Typically called by `iterate_statistic_interval_amounts`. * * @param cls a `json_t *` JSON array to build * @param description description of the statistic @@ -223,7 +223,7 @@ TMH_private_get_statistics_amount_SLUG (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_statistics_amount_by_bucket"); + "iterate_statistic_bucket_amounts"); } } if (get_intervals) @@ -244,7 +244,7 @@ TMH_private_get_statistics_amount_SLUG (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_statistics_amount_by_interval"); + "iterate_statistic_interval_amounts"); } } return TALER_MHD_reply_json (connection, diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.c b/src/backend/taler-merchant-httpd_get-private-statistics-counter-SLUG.c @@ -28,7 +28,7 @@ /** * Function returning integer-valued statistics. - * Typically called by `lookup_statistics_counter_by_bucket`. + * Typically called by `iterate_statistic_bucket_counters`. * * @param cls a `json_t *` JSON array to build * @param description description of the statistic @@ -84,7 +84,7 @@ counter_by_bucket (void *cls, /** * Function returning integer-valued statistics for a time interval. - * Called by `lookup_statistics_counter_by_interval`. + * Called by `iterate_statistic_interval_counters`. * * @param cls a `json_t *` JSON array to build * @param description description of the statistic @@ -196,7 +196,7 @@ TMH_private_get_statistics_counter_SLUG (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_statistics_counter_by_bucket"); + "iterate_statistic_bucket_counters"); } } if (get_intervals) @@ -217,7 +217,7 @@ TMH_private_get_statistics_counter_SLUG (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_statistics_counter_by_interval"); + "iterate_statistic_interval_counters"); } } return TALER_MHD_reply_json (connection, diff --git a/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c b/src/backend/taler-merchant-httpd_get-private-statistics-report-transactions.c @@ -215,7 +215,7 @@ pdf_cb (void *cls, /** - * Typically called by `lookup_statistics_amount_by_bucket2`. + * Typically called by `iterate_statistic_bucket_amounts_by_range`. * * @param[in,out] cls our `struct ResponseContext` to update * @param bucket_start start time of the bucket @@ -327,7 +327,7 @@ make_transaction_volume_report (struct ResponseContext *rctx, rctx->hc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_statistics_amount_by_bucket2")) + "iterate_statistic_bucket_amounts_by_range")) ? GNUNET_NO : GNUNET_SYSERR; } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) @@ -369,7 +369,7 @@ make_transaction_volume_report (struct ResponseContext *rctx, /** - * Typically called by `lookup_statistics_counter_by_bucket2`. + * Typically called by `iterate_statistic_bucket_counters_by_range`. * * @param[in,out] cls our `struct ResponseContext` to update * @param bucket_start start time of the bucket @@ -480,7 +480,7 @@ make_transaction_count_report (struct ResponseContext *rctx, rctx->hc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_statistics_counter_by_bucket2")) + "iterate_statistic_bucket_counters_by_range")) ? GNUNET_NO : GNUNET_SYSERR; } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) diff --git a/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_get-private-templates-TEMPLATE_ID.c @@ -46,7 +46,7 @@ TMH_private_get_templates_ID ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_template"); + "get_template"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { diff --git a/src/backend/taler-merchant-httpd_get-private-templates.c b/src/backend/taler-merchant-httpd_get-private-templates.c @@ -68,7 +68,7 @@ TMH_private_get_templates (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_templates"); + "iterate_templates"); } return TALER_MHD_REPLY_JSON_PACK (connection, MHD_HTTP_OK, diff --git a/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c b/src/backend/taler-merchant-httpd_get-private-tokenfamilies-TOKEN_FAMILY_SLUG.c @@ -53,7 +53,7 @@ TMH_private_get_tokenfamilies_SLUG (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_token_family"); + "get_token_family"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == status) { diff --git a/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.c b/src/backend/taler-merchant-httpd_get-private-webhooks-WEBHOOK_ID.c @@ -52,7 +52,7 @@ TMH_private_get_webhooks_ID (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_webhook"); + "get_webhook"); } if (0 == qs) { diff --git a/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.c b/src/backend/taler-merchant-httpd_get-products-IMAGE_HASH-image.c @@ -64,7 +64,7 @@ TMH_get_products_image (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_product_image_by_hash"); + "get_product_image_by_hash"); } if ( (0 == qs) || (NULL == image) ) diff --git a/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.c b/src/backend/taler-merchant-httpd_get-sessions-SESSION_ID.c @@ -240,7 +240,7 @@ TMH_get_sessions_ID ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_order_by_fulfillment"); + "get_order_by_fulfillment"); } if ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) && is_past) @@ -272,7 +272,7 @@ TMH_get_sessions_ID ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_order_status"); + "get_order_status"); } } diff --git a/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_get-templates-TEMPLATE_ID.c @@ -376,7 +376,7 @@ handle_get_templates_inventory ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_inventory_products"); + "iterate_inventory_products"); } } else if ( (0 < num_product_ids) || @@ -403,7 +403,7 @@ handle_get_templates_inventory ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_inventory_products_filtered"); + "iterate_inventory_products_filtered"); } } GNUNET_free (product_ids); @@ -430,7 +430,7 @@ handle_get_templates_inventory ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_categories_by_ids"); + "iterate_categories_by_ids"); } } @@ -455,7 +455,7 @@ handle_get_templates_inventory ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_custom_units_by_names"); + "iterate_custom_units_by_names"); } } @@ -526,7 +526,7 @@ TMH_get_templates_ID ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_template"); + "get_template"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.c b/src/backend/taler-merchant-httpd_post-challenge-ID-confirm.c @@ -109,14 +109,14 @@ TMH_post_challenge_ID_confirm (const struct TMH_RequestHandler *rh, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_COMMIT_FAILED, - "solve_mfa_challenge"); + "do_solve_mfa_challenge"); case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); return TALER_MHD_reply_with_error ( hc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_SOFT_FAILURE, - "solve_mfa_challenge"); + "do_solve_mfa_challenge"); case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: GNUNET_break_op (0); return TALER_MHD_reply_with_error ( diff --git a/src/backend/taler-merchant-httpd_post-challenge-ID.c b/src/backend/taler-merchant-httpd_post-challenge-ID.c @@ -33,7 +33,7 @@ /** * How many attempts do we allow per solution at most? Note that * this is just for the API, the value must also match the - * database logic in create_mfa_challenge. + * database logic in insert_mfa_challenge. */ #define MAX_SOLUTIONS 3 @@ -625,14 +625,14 @@ phase_lookup (struct MfaState *mfa) respond_with_error (mfa, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_COMMIT_FAILED, - "lookup_mfa_challenge"); + "get_mfa_challenge"); return; case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); respond_with_error (mfa, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_SOFT_FAILURE, - "lookup_mfa_challenge"); + "get_mfa_challenge"); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: GNUNET_break_op (0); diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-abort.c @@ -202,7 +202,7 @@ struct AbortContext * #refund_coins() row callback. Set to * #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT before starting the * iteration over the deposits, and to the failed query status if - * one of the refund_coin() operations failed. Inspected by + * one of the insert_refund_by_coin() operations failed. Inspected by * #begin_transaction() once the iteration has finished. */ enum GNUNET_DB_QueryStatus row_qs; @@ -861,7 +861,7 @@ begin_transaction (struct AbortContext *ac) "deposits"); goto cleanup; } - /* Check if one of the refund_coin() operations done by the + /* Check if one of the insert_refund_by_coin() operations done by the #refund_coins() row callback failed; we must handle this here (and not in the callback) as we may only roll back and restart the transaction from outside of the row iteration. */ @@ -878,7 +878,7 @@ begin_transaction (struct AbortContext *ac) resume_abort_with_error (ac, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "refund_coin"); + "insert_refund_by_coin"); goto cleanup; } diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-paid.c @@ -138,13 +138,13 @@ TMH_post_orders_ID_paid (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "update_contract_session"); + "update_contract_terms_session"); case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "update_contract_session"); + "update_contract_terms_session"); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: /* continued below */ break; diff --git a/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ORDER_ID-pay.c @@ -2079,7 +2079,7 @@ phase_final_output_token_processing (struct PayContext *pc) TALER_MERCHANTDB_preflight (TMH_db); if (GNUNET_OK != TALER_MERCHANTDB_start (TMH_db, - "insert_order_blinded_sigs")) + "insert_order_token_blinded_sig")) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "start insert_order_blinded_sigs_failed"); @@ -3195,7 +3195,7 @@ phase_execute_pay_transaction (struct PayContext *pc) pc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "increment_money_pots")); + "update_money_pot_totals")); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: /* strange */ @@ -4365,7 +4365,7 @@ phase_contract_paid (struct PayContext *pc) pc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_deposits_by_order")); + "iterate_deposits_by_order")); return; } } @@ -4396,7 +4396,7 @@ phase_contract_paid (struct PayContext *pc) pc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_spent_tokens_by_order")); + "iterate_used_tokens_by_order")); return; } } @@ -4428,7 +4428,7 @@ phase_contract_paid (struct PayContext *pc) pc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_order_blinded_sigs")); + "iterate_order_token_blinded_sigs")); return; } @@ -4902,7 +4902,7 @@ phase_parse_wallet_data (struct PayContext *pc) pc->connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_order_charity")); + "get_donau_instance_by_url")); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: TALER_MERCHANTDB_rollback (TMH_db); diff --git a/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.c b/src/backend/taler-merchant-httpd_post-private-accounts-H_WIRE-kycauth.c @@ -611,7 +611,7 @@ phase_parse (struct KycAuthContext *kac) kac->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR; kac->response = TALER_MHD_make_error ( TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_account"); + "get_account"); kac->phase = KP_RETURN_RESPONSE; return; } diff --git a/src/backend/taler-merchant-httpd_post-private-accounts.c b/src/backend/taler-merchant-httpd_post-private-accounts.c @@ -312,14 +312,14 @@ TMH_private_post_account (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_accounts"); + "iterate_accounts"); case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); return TALER_MHD_reply_with_error ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_accounts"); + "iterate_accounts"); case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: break; case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: @@ -421,7 +421,7 @@ TMH_private_post_account (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_INVARIANT_FAILURE, - "activate_account"); + "do_insert_account"); case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); TMH_wire_method_free (wm); @@ -429,7 +429,7 @@ TMH_private_post_account (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "activate_account"); + "do_insert_account"); case GNUNET_DB_STATUS_HARD_ERROR: GNUNET_break (0); TMH_wire_method_free (wm); @@ -437,7 +437,7 @@ TMH_private_post_account (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "activate_account"); + "do_insert_account"); } if (not_found) { diff --git a/src/backend/taler-merchant-httpd_post-private-donau.c b/src/backend/taler-merchant-httpd_post-private-donau.c @@ -320,7 +320,7 @@ TMH_private_post_donau_instance (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "check_donau_instance"); + "get_exists_donau_instance"); break; case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: pdc->http_status = MHD_HTTP_NO_CONTENT; diff --git a/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.c b/src/backend/taler-merchant-httpd_post-private-orders-ORDER_ID-refund.c @@ -218,7 +218,7 @@ TMH_private_post_orders_ID_refund ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_contract_terms"); + "get_contract_terms"); } return TALER_MHD_reply_with_error ( connection, @@ -411,7 +411,7 @@ TMH_private_post_orders_ID_refund ( NULL); case TALER_MERCHANTDB_RS_NO_SUCH_ORDER: /* We know the order exists from the - "lookup_contract_terms" at the beginning; + "get_contract_terms" at the beginning; so if we get 'no such order' here, it must be read as "no PAID order" */ return TALER_MHD_reply_with_error ( diff --git a/src/backend/taler-merchant-httpd_post-private-orders.c b/src/backend/taler-merchant-httpd_post-private-orders.c @@ -1787,7 +1787,7 @@ add_output_token_family (struct OrderContext *oc, reply_with_error (oc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_token_family_key"); + "get_token_family_key"); return GNUNET_SYSERR; case GNUNET_DB_STATUS_SOFT_ERROR: /* Single-statement transaction shouldn't possibly cause serialization errors. @@ -1796,7 +1796,7 @@ add_output_token_family (struct OrderContext *oc, reply_with_error (oc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_SOFT_FAILURE, - "lookup_token_family_key"); + "get_token_family_key"); return GNUNET_SYSERR; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: GNUNET_log (GNUNET_ERROR_TYPE_WARNING, @@ -1840,7 +1840,7 @@ add_output_token_family (struct OrderContext *oc, if (NULL != key_details.pub.public_key) { - /* lookup_token_family_key must have found a matching key, + /* get_token_family_key must have found a matching key, and it must have been added. Find and use the index. */ GNUNET_CRYPTO_blind_sign_pub_decref (key_details.pub.public_key); GNUNET_CRYPTO_blind_sign_priv_decref (key_details.priv.private_key); @@ -3255,7 +3255,7 @@ phase_merge_inventory (struct OrderContext *oc) reply_with_error (oc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "check_money_pots"); + "get_missing_money_pot"); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: /* great, good case! */ @@ -4074,14 +4074,14 @@ phase_parse_request (struct OrderContext *oc) reply_with_error (oc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "select_otp"); + "get_otp_device"); return; case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); reply_with_error (oc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_SOFT_FAILURE, - "select_otp"); + "get_otp_device"); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: reply_with_error (oc, diff --git a/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.c b/src/backend/taler-merchant-httpd_post-private-products-PRODUCT_ID-lock.c @@ -117,7 +117,7 @@ TMH_private_post_products_ID_lock ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_product"); + "get_product"); case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); TALER_MERCHANTDB_product_details_free (&pd); @@ -126,7 +126,7 @@ TMH_private_post_products_ID_lock ( connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_SOFT_FAILURE, - "lookup_product"); + "get_product"); case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: GNUNET_break_op (0); TALER_MERCHANTDB_product_details_free (&pd); diff --git a/src/backend/taler-merchant-httpd_post-private-templates.c b/src/backend/taler-merchant-httpd_post-private-templates.c @@ -161,7 +161,7 @@ TMH_private_post_templates (const struct TMH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_STORE_FAILED, - "select_otp_serial"); + "get_otp_device_serial"); case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: GNUNET_JSON_parse_free (spec); return TALER_MHD_reply_with_error (connection, diff --git a/src/backend/taler-merchant-httpd_post-private-tokenfamilies.c b/src/backend/taler-merchant-httpd_post-private-tokenfamilies.c @@ -292,7 +292,7 @@ TMH_private_post_token_families (const struct TMH_RequestHandler *rh, details.slug, &existing); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "lookup_token_family returned %d\n", + "get_token_family returned %d\n", (int) qs); switch (qs) { @@ -305,7 +305,7 @@ TMH_private_post_token_families (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_token_family"); + "get_token_family"); case GNUNET_DB_STATUS_SOFT_ERROR: TALER_MERCHANTDB_rollback (TMH_db); break; @@ -314,7 +314,7 @@ TMH_private_post_token_families (const struct TMH_RequestHandler *rh, connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_INVARIANT_FAILURE, - "lookup_token_family failed after insert_token_family failed"); + "get_token_family failed after insert_token_family failed"); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: { bool eq; diff --git a/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.c b/src/backend/taler-merchant-httpd_post-reports-REPORT_ID.c @@ -94,7 +94,7 @@ TMH_post_reports_ID ( return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "check_report"); + "get_report_by_token"); } if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) { diff --git a/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.c b/src/backend/taler-merchant-httpd_post-templates-TEMPLATE_ID.c @@ -649,7 +649,7 @@ handle_phase_lookup_template ( use_reply_with_error (uc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_template"); + "get_template"); return; case GNUNET_DB_STATUS_SOFT_ERROR: /* this should be impossible (single select) */ @@ -657,7 +657,7 @@ handle_phase_lookup_template ( use_reply_with_error (uc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_template"); + "get_template"); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: /* template not found! */ @@ -764,14 +764,14 @@ handle_phase_db_fetch (struct UseContext *uc) use_reply_with_error (uc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_product"); + "get_product"); return; case GNUNET_DB_STATUS_SOFT_ERROR: GNUNET_break (0); use_reply_with_error (uc, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "lookup_product"); + "get_product"); return; case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: use_reply_with_error (uc, diff --git a/src/backend/taler-merchant-kyccheck.c b/src/backend/taler-merchant-kyccheck.c @@ -412,7 +412,7 @@ static struct GNUNET_SCHEDULER_Task *account_task; /** * Counter determining how often we have called - * "select_accounts" on the database. + * "iterate_accounts" on the database. */ static uint64_t database_gen; @@ -1103,7 +1103,7 @@ exchange_check_cb ( return; } GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "account_kyc_set_status (%s, %s, %u, %s, %s) returned %d\n", + "insert_kyc_status (%s, %s, %u, %s, %s) returned %d\n", i->a->instance_id, i->e->keys->exchange_url, i->last_http_status, @@ -1286,7 +1286,7 @@ start_inquiry (struct Exchange *e, &i->aml_review, &i->jlimits); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "account_kyc_get_status (%s, %s, %s) returned %d (%u, #%llu)\n", + "iterate_kyc_statuses (%s, %s, %s) returned %d (%u, #%llu)\n", i->a->instance_id, e->keys->exchange_url, a->merchant_account_uri.full_payto, @@ -1431,7 +1431,7 @@ flag_ineligible (const char *instance_id, return; } GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "account_kyc_set_status (%s) returned %d\n", + "insert_kyc_status (%s) returned %d\n", exchange_url, (int) qs); } diff --git a/src/backenddb/do_expire_locks.c b/src/backenddb/do_expire_locks.c @@ -43,7 +43,7 @@ TALER_MERCHANTDB_do_expire_locks (struct TALER_MERCHANTDB_PostgresContext *pg) PREPARE (pg, "do_expire_locks", "SELECT expire_locks($1) " - " AS expire_locks"); + " AS do_expire_locks"); qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn, "do_expire_locks", params, diff --git a/src/backenddb/insert_order_token_blinded_sig.c b/src/backenddb/insert_order_token_blinded_sig.c @@ -15,7 +15,7 @@ */ /** * @file src/backenddb/insert_order_token_blinded_sig.c - * @brief implementation of insert_order_blinded_sigs() for Postgres + * @brief implementation of insert_order_token_blinded_sig() for Postgres * @author Bohdan Potuzhnyi */ #include "platform.h" diff --git a/src/backenddb/iterate_accounts.c b/src/backenddb/iterate_accounts.c @@ -25,7 +25,7 @@ /** - * Context for select_accounts(). + * Context for iterate_accounts(). */ struct SelectAccountsContext { diff --git a/src/backenddb/iterate_accounts_by_instance.c b/src/backenddb/iterate_accounts_by_instance.c @@ -25,7 +25,7 @@ /** - * Context for select_accounts(). + * Context for iterate_accounts(). */ struct SelectAccountsContext { diff --git a/src/backenddb/iterate_all_donau_instances.c b/src/backenddb/iterate_all_donau_instances.c @@ -26,7 +26,7 @@ #include "helper.h" /** - * Context for select_donau_instances(). + * Context for iterate_donau_instances(). */ struct SelectDonauInstanceContext { diff --git a/src/backenddb/iterate_donau_instances.c b/src/backenddb/iterate_donau_instances.c @@ -26,7 +26,7 @@ #include "helper.h" /** - * Context for select_donau_instances(). + * Context for iterate_donau_instances(). */ struct SelectDonauInstanceContext { diff --git a/src/backenddb/iterate_donau_instances_filtered.c b/src/backenddb/iterate_donau_instances_filtered.c @@ -26,7 +26,7 @@ /** - * Context for select_donau_instances_filtered(). + * Context for iterate_donau_instances_filtered(). */ struct SelectDonauInstanceContext { diff --git a/src/backenddb/iterate_instances.c b/src/backenddb/iterate_instances.c @@ -25,7 +25,7 @@ /** - * Context for lookup_instances(). + * Context for iterate_instances(). */ struct LookupInstancesContext { diff --git a/src/backenddb/iterate_pending_deposits.c b/src/backenddb/iterate_pending_deposits.c @@ -25,7 +25,7 @@ /** - * Context for lookup_pending_deposits(). + * Context for iterate_pending_deposits(). */ struct LookupDepositsContext { diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c @@ -380,7 +380,7 @@ check_accounts_equal (const struct TALER_MERCHANTDB_AccountDetails *a, /** - * Called after testing 'lookup_instances'. + * Called after testing 'iterate_instances'. * * @param cls pointer to 'struct TestLookupInstances_Closure'. * @param merchant_pub public key of the instance @@ -455,7 +455,7 @@ test_update_instance (const struct InstanceData *updated_data, /** - * Tests @e lookup_instances. + * Tests @e iterate_instances. * * @param active_only whether to lookup all instance, or only active ones. * @param instances_length number of instances to compare to in @e instances. @@ -3790,7 +3790,7 @@ make_transfer (const struct ExchangeSignkeyData *signkey, /** - * Closure for testing 'lookup_transfer_summary' + * Closure for testing 'iterate_transfer_summaries' */ struct TestLookupTransferSummary_Closure { @@ -3894,7 +3894,7 @@ test_lookup_transfer_summary ( /** - * Closure for testing 'lookup_transfer_details'. + * Closure for testing 'iterate_transfer_details'. */ struct TestLookupTransferDetails_Closure { @@ -4016,7 +4016,7 @@ test_lookup_transfer_details ( /** - * Closure for 'lookup_transfer_details_by_order'. + * Closure for 'iterate_transfer_details_by_order'. */ struct TestLookupTransferDetailsByOrder_Closure { @@ -4072,7 +4072,7 @@ lookup_transfer_details_order_cb ( cmp->results_length += 1; for (unsigned int i = 0; i < cmp->transfers_to_cmp_length; ++i) { - /* Right now lookup_transfer_details_by_order leaves execution_time + /* Right now iterate_transfer_details_by_order leaves execution_time uninitialized */ if ((0 == GNUNET_memcmp (&cmp->transfers_to_cmp[i].wtid, wtid)) && @@ -4227,7 +4227,7 @@ test_lookup_wire_fee (const struct ExchangeSignkeyData *signkey, /** - * Closure for 'lookup_transfers'. + * Closure for 'iterate_transfers'. */ struct TestLookupTransfers_Closure { @@ -4737,7 +4737,7 @@ test_transfers (void) /** - * Closure for testing lookup_refunds. + * Closure for testing iterate_refunds. */ struct TestLookupRefunds_Closure { @@ -4922,7 +4922,7 @@ struct RefundProofData /** - * Closure for testing lookup_refunds_detailed. + * Closure for testing iterate_refunds_detailed. */ struct TestLookupRefundsDetailed_Closure { diff --git a/src/include/merchant-database/get_product_image_by_hash.h b/src/include/merchant-database/get_product_image_by_hash.h @@ -15,7 +15,7 @@ */ /** * @file src/include/merchant-database/get_product_image_by_hash.h - * @brief declaration of lookup_product_image_by_hash for Postgres + * @brief declaration of get_product_image_by_hash for Postgres * @author Bohdan Potuzhnyi */ #ifndef MERCHANT_DATABASE_GET_PRODUCT_IMAGE_BY_HASH_H diff --git a/src/include/merchant-database/iterate_all_donau_instances.h b/src/include/merchant-database/iterate_all_donau_instances.h @@ -29,7 +29,7 @@ /** - * Callback function typically used by `select_donau_instances` to handle + * Callback function typically used by `iterate_donau_instances` to handle * the details of each Donau instance retrieved from the database. * * @param cls Closure to pass additional context or data to the callback function. diff --git a/src/include/merchant-database/iterate_all_products.h b/src/include/merchant-database/iterate_all_products.h @@ -27,7 +27,7 @@ /** - * Typically called by `lookup_all_products`. + * Typically called by `iterate_all_products`. * * @param cls a `json_t *` JSON array to build * @param product_serial row ID of the product diff --git a/src/include/merchant-database/iterate_categories.h b/src/include/merchant-database/iterate_categories.h @@ -27,7 +27,7 @@ /** - * Typically called by `lookup_categories`. + * Typically called by `iterate_categories`. * * @param cls closure * @param category_id ID of the category diff --git a/src/include/merchant-database/iterate_categories_by_ids.h b/src/include/merchant-database/iterate_categories_by_ids.h @@ -25,7 +25,7 @@ /** - * Typically called by `lookup_categories`. + * Typically called by `iterate_categories`. * * @param cls closure * @param category_id ID of the category diff --git a/src/include/merchant-database/iterate_custom_units_by_names.h b/src/include/merchant-database/iterate_custom_units_by_names.h @@ -28,7 +28,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_units`. + * Typically called by `iterate_units`. * * @param cls closure * @param unit_serial database identifier diff --git a/src/include/merchant-database/iterate_donau_instances.h b/src/include/merchant-database/iterate_donau_instances.h @@ -30,7 +30,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Callback function typically used by `select_donau_instances` to handle + * Callback function typically used by `iterate_donau_instances` to handle * the details of each Donau instance retrieved from the database. * * @param cls Closure to pass additional context or data to the callback function. diff --git a/src/include/merchant-database/iterate_donau_instances_filtered.h b/src/include/merchant-database/iterate_donau_instances_filtered.h @@ -31,7 +31,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Callback function typically used by `select_donau_instances` to handle + * Callback function typically used by `iterate_donau_instances` to handle * the details of each Donau instance retrieved from the database. * * @param cls Closure to pass additional context or data to the callback function. diff --git a/src/include/merchant-database/iterate_instances.h b/src/include/merchant-database/iterate_instances.h @@ -26,7 +26,7 @@ #include "merchantdb_lib.h" /** - * Typically called by `lookup_instances`. + * Typically called by `iterate_instances`. * * @param cls closure * @param merchant_pub public key of the instance diff --git a/src/include/merchant-database/iterate_inventory_products.h b/src/include/merchant-database/iterate_inventory_products.h @@ -27,7 +27,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_inventory_products`. + * Typically called by `iterate_inventory_products`. * * @param cls a `json_t *` JSON array to build * @param product_id ID of the product diff --git a/src/include/merchant-database/iterate_inventory_products_filtered.h b/src/include/merchant-database/iterate_inventory_products_filtered.h @@ -27,7 +27,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_inventory_products`. + * Typically called by `iterate_inventory_products`. * * @param cls a `json_t *` JSON array to build * @param product_id ID of the product diff --git a/src/include/merchant-database/iterate_kyc_statuses.h b/src/include/merchant-database/iterate_kyc_statuses.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Function called from ``account_kyc_get_status`` + * Function called from ``iterate_kyc_statuses`` * with KYC status information for this merchant. * * @param cls closure diff --git a/src/include/merchant-database/iterate_login_tokens.h b/src/include/merchant-database/iterate_login_tokens.h @@ -27,7 +27,7 @@ /** - * Typically called by `lookup_login_tokens`. + * Typically called by `iterate_login_tokens`. * * @param cls a `json_t *` JSON array to build * @param creation_time creation time of the token diff --git a/src/include/merchant-database/iterate_money_pots.h b/src/include/merchant-database/iterate_money_pots.h @@ -27,7 +27,7 @@ /** - * Typically called by `select_money_pots`. + * Typically called by `iterate_money_pots`. * * @param cls closure * @param name set to name of the pot diff --git a/src/include/merchant-database/iterate_order_token_blinded_sigs.h b/src/include/merchant-database/iterate_order_token_blinded_sigs.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `select_order_blinded_sigs` + * Typically called by `iterate_order_token_blinded_sigs` * * @param cls closure * @param hash hash of the token diff --git a/src/include/merchant-database/iterate_orders.h b/src/include/merchant-database/iterate_orders.h @@ -86,7 +86,7 @@ struct TALER_MERCHANTDB_OrderFilter /** - * Typically called by `lookup_orders`. + * Typically called by `iterate_orders`. * * @param cls a `json_t *` JSON array to build * @param order_id ID of the order diff --git a/src/include/merchant-database/iterate_otp_devices.h b/src/include/merchant-database/iterate_otp_devices.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_otp_devices`. + * Typically called by `iterate_otp_devices`. * * @param cls closure * @param otp_id ID of the OTP device diff --git a/src/include/merchant-database/iterate_outdated_kyc_statuses.h b/src/include/merchant-database/iterate_outdated_kyc_statuses.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Function called from ``account_kyc_get_outdated`` + * Function called from ``iterate_outdated_kyc_statuses`` * with information about outdated KYC status information. * * @param cls closure diff --git a/src/include/merchant-database/iterate_pending_deposits.h b/src/include/merchant-database/iterate_pending_deposits.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Callback for results from `lookup_pending_deposits`. + * Callback for results from `iterate_pending_deposits`. * * @param cls NULL * @param deposit_serial identifies the deposit operation diff --git a/src/include/merchant-database/iterate_pending_reports.h b/src/include/merchant-database/iterate_pending_reports.h @@ -28,7 +28,7 @@ /** - * Typically called by `lookup_reports_pending`. + * Typically called by `iterate_pending_reports`. * * @param cls closure * @param instance_id name of the instance diff --git a/src/include/merchant-database/iterate_pending_webhooks.h b/src/include/merchant-database/iterate_pending_webhooks.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_pending_webhooks`. + * Typically called by `iterate_pending_webhooks`. * * @param cls a `json_t *` JSON array to build * @param webhook_pending_serial reference to the configured webhook template. diff --git a/src/include/merchant-database/iterate_pending_webhooks_above_serial_id.h b/src/include/merchant-database/iterate_pending_webhooks_above_serial_id.h @@ -27,7 +27,7 @@ /** - * Typically called by `lookup_all_webhooks`. + * Typically called by `iterate_pending_webhooks_above_serial_id`. * * @param cls a `json_t *` JSON array to build * @param webhook_serial reference to the configured webhook template. diff --git a/src/include/merchant-database/iterate_product_groups.h b/src/include/merchant-database/iterate_product_groups.h @@ -27,7 +27,7 @@ /** - * Typically called by `select_product_groups`. + * Typically called by `iterate_product_groups`. * * @param cls closure * @param product_group_id ID of the product group diff --git a/src/include/merchant-database/iterate_products.h b/src/include/merchant-database/iterate_products.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_products`. + * Typically called by `iterate_products`. * * @param cls a `json_t *` JSON array to build * @param product_serial row ID of the product diff --git a/src/include/merchant-database/iterate_reconciliation_details.h b/src/include/merchant-database/iterate_reconciliation_details.h @@ -29,7 +29,7 @@ /** * Function returning reconciliation details for an * expected incoming wire transfer. - * Called by `lookup_reconciliation_details`. + * Called by `iterate_reconciliation_details`. * * @param cls closure * @param order_id order that was paid and then aggregated diff --git a/src/include/merchant-database/iterate_reports.h b/src/include/merchant-database/iterate_reports.h @@ -27,7 +27,7 @@ /** - * Typically called by `select_reports`. + * Typically called by `iterate_reports`. * * @param cls closure * @param report_id ID of the report diff --git a/src/include/merchant-database/iterate_statistic_bucket_amounts.h b/src/include/merchant-database/iterate_statistic_bucket_amounts.h @@ -27,7 +27,7 @@ /** * Returns amount-valued statistics by bucket. - * Called by `lookup_statistics_amount_by_bucket`. + * Called by `iterate_statistic_bucket_amounts`. * * @param cls closure * @param description description of the statistic diff --git a/src/include/merchant-database/iterate_statistic_bucket_amounts_by_range.h b/src/include/merchant-database/iterate_statistic_bucket_amounts_by_range.h @@ -30,7 +30,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** * Returns amount-valued statistics by bucket. - * Called by `lookup_statistics_amount_by_bucket`. + * Called by `iterate_statistic_bucket_amounts`. * * @param cls closure * @param description description of the statistic @@ -52,7 +52,7 @@ typedef void /** * Returns amount-valued statistics by bucket. - * Called by `lookup_statistics_amount_by_bucket2`. + * Called by `iterate_statistic_bucket_amounts_by_range`. * * @param cls closure * @param bucket_start start time of the bucket diff --git a/src/include/merchant-database/iterate_statistic_bucket_counters.h b/src/include/merchant-database/iterate_statistic_bucket_counters.h @@ -28,7 +28,7 @@ /** * Function returning integer-valued statistics for a bucket. - * Called by `lookup_statistics_counter_by_bucket`. + * Called by `iterate_statistic_bucket_counters`. * * @param cls closure * @param description description of the statistic diff --git a/src/include/merchant-database/iterate_statistic_bucket_counters_by_range.h b/src/include/merchant-database/iterate_statistic_bucket_counters_by_range.h @@ -28,7 +28,7 @@ /** * Function returning integer-valued statistics for a bucket. - * Called by `lookup_statistics_counter_by_bucket2`. + * Called by `iterate_statistic_bucket_counters_by_range`. * * @param cls closure * @param bucket_start start time of the bucket diff --git a/src/include/merchant-database/iterate_statistic_interval_amounts.h b/src/include/merchant-database/iterate_statistic_interval_amounts.h @@ -28,7 +28,7 @@ /** * Returns amount-valued statistics over a particular time interval. - * Called by `lookup_statistics_amount_by_interval`. + * Called by `iterate_statistic_interval_amounts`. * * @param cls closure * @param description description of the statistic diff --git a/src/include/merchant-database/iterate_statistic_interval_counters.h b/src/include/merchant-database/iterate_statistic_interval_counters.h @@ -47,7 +47,7 @@ struct TALER_MERCHANTDB_StatisticsCounterByIntervalDetails /** * Function returning integer-valued statistics for a time interval. - * Called by `lookup_statistics_counter_by_interval`. + * Called by `iterate_statistic_interval_counters`. * * @param cls closure * @param description description of the statistic diff --git a/src/include/merchant-database/iterate_templates.h b/src/include/merchant-database/iterate_templates.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_templates`. + * Typically called by `iterate_templates`. * * @param cls closure * @param template_id ID of the template diff --git a/src/include/merchant-database/iterate_token_families.h b/src/include/merchant-database/iterate_token_families.h @@ -26,7 +26,7 @@ #include "merchantdb_lib.h" /** - * Typically called by `lookup_token_families`. + * Typically called by `iterate_token_families`. * * @param cls closure * @param slug slug of the token family diff --git a/src/include/merchant-database/iterate_transfer_details_by_order.h b/src/include/merchant-database/iterate_transfer_details_by_order.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_transfer_details_by_order`. + * Typically called by `iterate_transfer_details_by_order`. * * @param cls closure * @param wtid wire transfer subject of the wire transfer for the coin diff --git a/src/include/merchant-database/iterate_units.h b/src/include/merchant-database/iterate_units.h @@ -29,7 +29,7 @@ struct TALER_MERCHANTDB_PostgresContext; /* Callback typedefs */ /** - * Typically called by `lookup_units`. + * Typically called by `iterate_units`. * * @param cls closure * @param unit_serial database identifier diff --git a/src/include/merchant-database/iterate_webhooks.h b/src/include/merchant-database/iterate_webhooks.h @@ -27,7 +27,7 @@ /** - * Typically called by `lookup_webhooks`. + * Typically called by `iterate_webhooks`. * * @param cls a `json_t *` JSON array to build * @param webhook_id ID of the webhook diff --git a/src/include/merchant-database/iterate_webhooks_by_event.h b/src/include/merchant-database/iterate_webhooks_by_event.h @@ -27,7 +27,7 @@ /** - * Typically called by `lookup_webhook_by_event`. + * Typically called by `iterate_webhooks_by_event`. * * @param cls a `json_t *` JSON array to build * @param webhook_serial reference to the configured webhook template.