Factor out inactivate_account (shit job)

1 files changed, 3 insertions, 39 deletions

diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 463a8328..b5f8debc 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -51,6 +51,7 @@
 #include "pg_purge_instance.h"
 #include "pg_update_instance.h"
 #include "pg_update_instance_auth.h"
+#include "pg_inactivate_account.h"
 #include "pg_set_transfer_status_to_confirmed.h"
 
 
@@ -329,33 +330,6 @@ postgres_commit (void *cls)
 
 
 /**
- * Set an instance's account in our database to "inactive".
- *
- * @param cls closure
- * @param merchant_id merchant backend instance ID
- * @param h_wire hash of the wire account to set to inactive
- * @return database result code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_inactivate_account (void *cls,
-                             const char *merchant_id,
-                             const struct TALER_MerchantWireHashP *h_wire)
-{
-  struct PostgresClosure *pg = cls;
-  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_end
-  };
-
-  check_connection (pg);
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "inactivate_account",
-                                             params);
-}
-
-
-/**
  * Set an instance's account in our database to "active".
  *
  * @param cls closure
@@ -6592,17 +6566,6 @@ postgres_connect (void *cls)
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("end_transaction",
                             "COMMIT"),
-    /* for postgres_inactivate_account(); the merchant
-       instance is implied from the random salt that
-       is part of the h_wire calculation */
-    GNUNET_PQ_make_prepare ("inactivate_account",
-                            "UPDATE merchant_accounts SET"
-                            " active=FALSE"
-                            " WHERE h_wire=$2"
-                            "  AND merchant_serial="
-                            "   (SELECT merchant_serial"
-                            "      FROM merchant_instances"
-                            "      WHERE merchant_id=$1)"),
     /* for postgres_activate_account() */
     GNUNET_PQ_make_prepare ("activate_account",
                             "UPDATE merchant_accounts SET"
@@ -8928,7 +8891,8 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
   plugin->update_instance_auth
     = &TMH_PG_update_instance_auth;
   plugin->activate_account = &postgres_activate_account;
-  plugin->inactivate_account = &postgres_inactivate_account;
+  plugin->inactivate_account
+    = &TMH_PG_inactivate_account;
   plugin->update_transfer_status
     = &TMH_PG_update_transfer_status;
   plugin->lookup_products = &postgres_lookup_products;