exchange

commit ef4b71af6edcfa3735b180993c855f60ce61f720
parent e2f536b4090a74eb79cce4ed5f5be59916d5c545
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 27 Mar 2025 15:01:06 +0100

more merge fixes

Diffstat:
M
src/exchange/taler-exchange-httpd_batch-deposit.c
 | 
2
+-
M
src/exchange/taler-exchange-httpd_batch-withdraw.c
 | 
2
+-
M
src/exchange/taler-exchange-httpd_reveal-withdraw.c
 | 
4
++--
M
src/exchangedb/0009-aggregation_transient.sql
 | 
5
-----
M
src/exchangedb/pg_get_batch_withdraw_info.c
 | 
2
+-
M
src/include/taler_exchangedb_plugin.h
 | 
8
++++----

6 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_batch-deposit.c b/src/exchange/taler-exchange-httpd_batch-deposit.c
@@ -479,7 +479,7 @@ check_request_idempotent (
                    rc->connection,
                    MHD_HTTP_INTERNAL_SERVER_ERROR,
                    TALER_EC_GENERIC_DB_FETCH_FAILED,
-                   "get_withdraw_info"));
+                   "do_check_deposit_idempotent"));
     return true;
   }
   if ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) ||
diff --git a/src/exchange/taler-exchange-httpd_batch-withdraw.c b/src/exchange/taler-exchange-httpd_batch-withdraw.c
@@ -387,7 +387,7 @@ check_idempotency (
       SET_ERROR_WITH_DETAIL (wc,
                              ERROR_DB_FETCH_FAILED,
                              db_fetch_context,
-                             "get_withdraw_info");
+                             "get_batch_withdraw_info");
       return true; /* Well, kind-of. */
     }
     if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
diff --git a/src/exchange/taler-exchange-httpd_reveal-withdraw.c b/src/exchange/taler-exchange-httpd_reveal-withdraw.c
@@ -166,7 +166,7 @@ find_original_commitment (
     case GNUNET_DB_STATUS_HARD_ERROR:
       *result = TALER_MHD_reply_with_ec (connection,
                                          TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                         "get_withdraw_info");
+                                         "get_withdraw");
       return GNUNET_SYSERR;
     case GNUNET_DB_STATUS_SOFT_ERROR:
       break; /* try again */
@@ -181,7 +181,7 @@ find_original_commitment (
   /* after unsuccessful retries*/
   *result = TALER_MHD_reply_with_ec (connection,
                                      TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                     "get_withdraw_info");
+                                     "get_withdraw");
   return GNUNET_SYSERR;
 }
 
diff --git a/src/exchangedb/0009-aggregation_transient.sql b/src/exchangedb/0009-aggregation_transient.sql
@@ -13,11 +13,6 @@
 -- You should have received a copy of the GNU General Public License along with
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 
-CREATE INDEX exchange_tables_by_pending
-  ON exchange_tables (table_serial_id)
-  WHERE NOT finished;
-COMMENT ON INDEX exchange_tables_by_pending
-  IS 'Used by exchange_do_create_tables';
 
 CREATE FUNCTION foreign_table_aggregation_transient9()
 RETURNS void
diff --git a/src/exchangedb/pg_get_batch_withdraw_info.c b/src/exchangedb/pg_get_batch_withdraw_info.c
@@ -15,7 +15,7 @@
  */
 /**
  * @file exchangedb/pg_get_batch_withdraw_info.c
- * @brief Implementation of the get_withdraw_info function for Postgres
+ * @brief Implementation of the get_batch_withdraw_info function for Postgres
  * @author Christian Grothoff
  */
 #include "platform.h"
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
@@ -4166,10 +4166,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return statement execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_withdraw_info)(void *cls,
-                       const struct TALER_BlindedCoinHashP *bch,
-                       struct TALER_EXCHANGEDB_CollectableBlindcoin *
-                       collectable);
+  (*get_batch_withdraw_info)(void *cls,
+                             const struct TALER_BlindedCoinHashP *bch,
+                             struct TALER_EXCHANGEDB_CollectableBlindcoin *
+                             collectable);
 
 
   /**