From dec32b9a7dd1a68c624cf6a87284ca9e015a6d7d Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 8 May 2023 21:07:11 -0600 Subject: Factor out account_kyc_set_status (shit job) --- src/backenddb/plugin_merchantdb_postgres.c | 81 +----------------------------- 1 file changed, 2 insertions(+), 79 deletions(-) (limited to 'src/backenddb/plugin_merchantdb_postgres.c') diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 9605c29e..e98eb94c 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -45,6 +45,7 @@ #include "pg_lookup_instance_auth.h" #include "pg_update_transfer_status.h" #include "pg_insert_instance.h" +#include "pg_account_kyc_set_status.h" #include "pg_set_transfer_status_to_confirmed.h" @@ -489,60 +490,6 @@ postgres_account_kyc_get_status (void *cls, } -/** - * Update an instance's account's KYC status. - * - * @param cls closure - * @param merchant_id merchant backend instance ID - * @param h_wire hash of the wire account to check - * @param exchange_url base URL of the exchange to check - * @param exchange_kyc_serial serial number for our account at the exchange (0 if unknown) - * @param exchange_sig signature of the exchange, or NULL for none - * @param exchange_pub public key of the exchange, or NULL for none - * @param timestamp timestamp to store - * @param kyc_ok current KYC status (true for satisfied) - * @param aml_decision current AML decision state at the exchange - * @return database result code - */ -static enum GNUNET_DB_QueryStatus -postgres_account_kyc_set_status ( - void *cls, - const char *merchant_id, - const struct TALER_MerchantWireHashP *h_wire, - const char *exchange_url, - uint64_t exchange_kyc_serial, - const struct TALER_ExchangeSignatureP *exchange_sig, - const struct TALER_ExchangePublicKeyP *exchange_pub, - struct GNUNET_TIME_Timestamp timestamp, - bool kyc_ok, - enum TALER_AmlDecisionState aml_decision) -{ - struct PostgresClosure *pg = cls; - uint32_t aml32 = (uint32_t) aml_decision; - struct GNUNET_PQ_QueryParam params[] = { - GNUNET_PQ_query_param_string (merchant_id), - GNUNET_PQ_query_param_auto_from_type (h_wire), - GNUNET_PQ_query_param_string (exchange_url), - GNUNET_PQ_query_param_uint64 (&exchange_kyc_serial), - GNUNET_PQ_query_param_timestamp (×tamp), - GNUNET_PQ_query_param_bool (kyc_ok), - exchange_pub - ? GNUNET_PQ_query_param_auto_from_type (exchange_pub) - : GNUNET_PQ_query_param_null (), - exchange_sig - ? GNUNET_PQ_query_param_auto_from_type (exchange_sig) - : GNUNET_PQ_query_param_null (), - GNUNET_PQ_query_param_uint32 (&aml32), - GNUNET_PQ_query_param_end - }; - - check_connection (pg); - return GNUNET_PQ_eval_prepared_non_select (pg->conn, - "upsert_account_kyc", - params); -} - - /** * Delete private key of an instance from our database. * @@ -6931,30 +6878,6 @@ postgres_connect (void *cls) struct GNUNET_PQ_PreparedStatement ps[] = { GNUNET_PQ_make_prepare ("end_transaction", "COMMIT"), - /* for postgres_account_kyc_set_status */ - GNUNET_PQ_make_prepare ("upsert_account_kyc", - "INSERT INTO merchant_kyc" - "(kyc_timestamp" - ",kyc_ok" - ",exchange_kyc_serial" - ",account_serial" - ",exchange_url" - ",exchange_pub" - ",exchange_sig" - ",aml_decision)" - " SELECT $5, $6, $4, account_serial, $3, $7, $8, $9" - " FROM merchant_instances" - " JOIN merchant_accounts USING (merchant_serial)" - " WHERE merchant_id=$1" - " AND h_wire=$2" - " ON CONFLICT(account_serial,exchange_url) DO " - "UPDATE" - " SET exchange_kyc_serial=$4" - " ,kyc_timestamp=$5" - " ,kyc_ok=$6" - " ,exchange_pub=$7" - " ,exchange_sig=$8" - " ,aml_decision=$9"), /* for postgres_account_kyc_get_status */ GNUNET_PQ_make_prepare ("lookup_kyc_status", "SELECT" @@ -9330,7 +9253,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) plugin->update_account = &TMH_PG_update_account; plugin->account_kyc_set_status - = &postgres_account_kyc_set_status; + = &TMH_PG_account_kyc_set_status; plugin->account_kyc_get_status = &postgres_account_kyc_get_status; plugin->delete_instance_private_key = &postgres_delete_instance_private_key; -- cgit v1.2.3