Factor out lookup_instance_auth (shit job)

1 files changed, 4 insertions, 43 deletions

diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 710fbdb3..a28fd716 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -20,6 +20,7 @@
  * @author Christian Grothoff
  * @author Marcello Stanisci
  * @author Priscilla Huang
+ * @author Iván Ávalos
  */
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
@@ -41,6 +42,7 @@
 #include "pg_select_accounts_by_exchange.h"
 #include "pg_insert_exchange_account.h"
 #include "pg_lookup_reserves.h"
+#include "pg_lookup_instance_auth.h"
 #include "pg_update_transfer_status.h"
 #include "pg_set_transfer_status_to_confirmed.h"
 
@@ -318,41 +320,6 @@ postgres_commit (void *cls)
                                              params);
 }
 
-
-/**
- * Lookup authentication data of an instance.
- *
- * @param cls closure
- * @param instance_id instance to query
- * @param[out] ias where to store the auth data
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_instance_auth (
-  void *cls,
-  const char *instance_id,
-  struct TALER_MERCHANTDB_InstanceAuthSettings *ias)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (instance_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("auth_hash",
-                                          &ias->auth_hash),
-    GNUNET_PQ_result_spec_auto_from_type ("auth_salt",
-                                          &ias->auth_salt),
-    GNUNET_PQ_result_spec_end
-  };
-
-  check_connection (pg);
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "lookup_instance_auth",
-                                                   params,
-                                                   rs);
-}
-
-
 /**
  * Insert information about an instance into our database.
  *
@@ -7027,13 +6994,6 @@ postgres_connect (void *cls)
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("end_transaction",
                             "COMMIT"),
-    /* for call_with_accounts(), part of postgres_lookup_instances() */
-    GNUNET_PQ_make_prepare ("lookup_instance_auth",
-                            "SELECT"
-                            " auth_hash"
-                            ",auth_salt"
-                            " FROM merchant_instances"
-                            " WHERE merchant_id=$1"),
     /* for postgres_insert_instance() */
     GNUNET_PQ_make_prepare ("insert_instance",
                             "INSERT INTO merchant_instances"
@@ -9455,7 +9415,8 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
   plugin->start_read_committed = &postgres_start_read_committed;
   plugin->rollback = &postgres_rollback;
   plugin->commit = &postgres_commit;
-  plugin->lookup_instance_auth = &postgres_lookup_instance_auth;
+  plugin->lookup_instance_auth
+    = &TMH_PG_lookup_instance_auth;
   plugin->insert_instance = &postgres_insert_instance;
   plugin->insert_account
     = &TMH_PG_insert_account;