-implement reserve closure in test

1 files changed, 6 insertions, 159 deletions

diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 899980471..9bf421553 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -31,6 +31,8 @@
 #include "taler_exchangedb_plugin.h"
 #include "pg_helper.h"
 #include "pg_do_reserve_open.h"
+#include "pg_get_expired_reserves.h"
+#include "pg_get_unfinished_close_requests.h"
 #include "pg_insert_close_request.h"
 #include "pg_insert_records_by_table.h"
 #include "pg_insert_reserve_open_deposit.h"
@@ -2344,32 +2346,6 @@ prepare_statements (struct PostgresClosure *pg)
       " FROM history_requests"
       " WHERE reserve_pub=$1"
       "  AND request_timestamp>=$2;"),
-    /* Used in #postgres_get_expired_reserves() */
-    GNUNET_PQ_make_prepare (
-      "get_expired_reserves",
-      "WITH ed AS MATERIALIZED ( "
-      " SELECT * "
-      " FROM reserves "
-      " WHERE expiration_date <= $1 "
-      "   AND (current_balance_val != 0 OR current_balance_frac != 0) "
-      " ORDER BY expiration_date ASC "
-      " LIMIT 1 "
-      ") "
-      "SELECT "
-      " ed.expiration_date "
-      " ,payto_uri AS account_details "
-      " ,ed.reserve_pub "
-      " ,current_balance_val "
-      " ,current_balance_frac "
-      "FROM ( "
-      " SELECT "
-      "  * "
-      " FROM reserves_in "
-      " WHERE reserve_pub = ( "
-      "     SELECT reserve_pub FROM ed) "
-      " ) ri "
-      "JOIN wire_targets wt ON (ri.wire_source_h_payto = wt.wire_target_h_payto) "
-      "JOIN ed ON (ri.reserve_pub = ed.reserve_pub);"),
     /* Used in #postgres_get_coin_transactions() to obtain recoup transactions
        for a coin */
     GNUNET_PQ_make_prepare (
@@ -8551,138 +8527,6 @@ postgres_insert_global_fee (void *cls,
 
 
 /**
- * Closure for #reserve_expired_cb().
- */
-struct ExpiredReserveContext
-{
-  /**
-   * Function to call for each expired reserve.
-   */
-  TALER_EXCHANGEDB_ReserveExpiredCallback rec;
-
-  /**
-   * Closure to give to @e rec.
-   */
-  void *rec_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Set to #GNUNET_SYSERR on error.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-reserve_expired_cb (void *cls,
-                    PGresult *result,
-                    unsigned int num_results)
-{
-  struct ExpiredReserveContext *erc = cls;
-  struct PostgresClosure *pg = erc->pg;
-  enum GNUNET_GenericReturnValue ret;
-
-  ret = GNUNET_OK;
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct GNUNET_TIME_Timestamp exp_date;
-    char *account_details;
-    struct TALER_ReservePublicKeyP reserve_pub;
-    struct TALER_Amount remaining_balance;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_timestamp ("expiration_date",
-                                       &exp_date),
-      GNUNET_PQ_result_spec_string ("account_details",
-                                    &account_details),
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                            &reserve_pub),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance",
-                                   &remaining_balance),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      ret = GNUNET_SYSERR;
-      break;
-    }
-    ret = erc->rec (erc->rec_cls,
-                    &reserve_pub,
-                    &remaining_balance,
-                    account_details,
-                    exp_date);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-  erc->status = ret;
-}
-
-
-/**
- * Obtain information about expired reserves and their
- * remaining balances.
- *
- * @param cls closure of the plugin
- * @param now timestamp based on which we decide expiration
- * @param rec function to call on expired reserves
- * @param rec_cls closure for @a rec
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_expired_reserves (void *cls,
-                               struct GNUNET_TIME_Timestamp now,
-                               TALER_EXCHANGEDB_ReserveExpiredCallback rec,
-                               void *rec_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&now),
-    GNUNET_PQ_query_param_end
-  };
-  struct ExpiredReserveContext ectx = {
-    .rec = rec,
-    .rec_cls = rec_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "get_expired_reserves",
-                                             params,
-                                             &reserve_expired_cb,
-                                             &ectx);
-  switch (ectx.status)
-  {
-  case GNUNET_SYSERR:
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  case GNUNET_NO:
-    return GNUNET_DB_STATUS_SOFT_ERROR;
-  case GNUNET_OK:
-    break;
-  }
-  return qs;
-}
-
-
-/**
  * Insert reserve close operation into database.
  *
  * @param cls closure
@@ -15118,7 +14962,6 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
   plugin->get_wire_fee = &postgres_get_wire_fee;
   plugin->get_global_fee = &postgres_get_global_fee;
   plugin->get_global_fees = &postgres_get_global_fees;
-  plugin->get_expired_reserves = &postgres_get_expired_reserves;
   plugin->insert_reserve_closed = &postgres_insert_reserve_closed;
   plugin->wire_prepare_data_insert = &postgres_wire_prepare_data_insert;
   plugin->wire_prepare_data_mark_finished =
@@ -15290,6 +15133,10 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
   /* NEW style, sort alphabetically! */
   plugin->do_reserve_open
     = &TEH_PG_do_reserve_open;
+  plugin->get_expired_reserves
+    = &TEH_PG_get_expired_reserves;
+  plugin->get_unfinished_close_requests
+    = &TEH_PG_get_unfinished_close_requests;
   plugin->insert_records_by_table
     = &TEH_PG_insert_records_by_table;
   plugin->insert_reserve_open_deposit