commit 3f891d944f141b4317b0c2c25f82e9e4053ce8ab
parent 69159619a3e1bfb816cc91d3cc9150198934b6cf
Author: Özgür Kesim <oec@codeblau.de>
Date: Wed, 30 Apr 2025 22:23:03 +0200
[exchange] disabling recoup endpoints for now
The recoup API as it is right now can not work with the
new refresh and withdraw data that is stored in the database.
The API needs to be re-designed to accomodate for those
changes.
Therefore, the endpoints are disabled and the corresponding tests
are commented out.
See issue #9828.
Diffstat:
5 files changed, 49 insertions(+), 32 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
@@ -385,6 +385,7 @@ handle_post_coins (struct TEH_RequestContext *rc,
.op = "melt",
.handler = &TEH_handler_melt
},
+#if FIXME_9828
{
.op = "recoup",
.handler = &TEH_handler_recoup
@@ -393,6 +394,7 @@ handle_post_coins (struct TEH_RequestContext *rc,
.op = "recoup-refresh",
.handler = &TEH_handler_recoup_refresh
},
+#endif
{
.op = "refund",
.handler = &TEH_handler_refund
diff --git a/src/exchangedb/pg_get_reserve_history.c b/src/exchangedb/pg_get_reserve_history.c
@@ -208,6 +208,10 @@ add_withdraw (void *cls,
&wd->noreveal_index),
&no_noreveal_index),
GNUNET_PQ_result_spec_allow_null (
+ GNUNET_PQ_result_spec_auto_from_type ("blinding_seed",
+ &wd->blinding_seed),
+ &wd->no_blinding_seed),
+ GNUNET_PQ_result_spec_allow_null (
GNUNET_PQ_result_spec_auto_from_type ("selected_h",
&wd->selected_h),
&no_selected_h),
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
@@ -161,8 +161,6 @@ check_PROGRAMS = \
test_exchange_api_age_restriction_rsa \
test_exchange_api_keys_cherry_picking_cs \
test_exchange_api_keys_cherry_picking_rsa \
- test_exchange_api_revocation_cs \
- test_exchange_api_revocation_rsa \
test_exchange_api_overlapping_keys_bug_cs \
test_exchange_api_overlapping_keys_bug_rsa \
test_exchange_management_api_cs \
@@ -183,6 +181,10 @@ endif
# test_auditor_api_cs
# test_auditor_api_rsa
+# FIXME_9828
+# test_exchange_api_revocation_cs
+# test_exchange_api_revocation_rsa
+
TESTS = \
$(check_PROGRAMS)
@@ -375,35 +377,37 @@ test_exchange_api_keys_cherry_picking_rsa_LDADD = \
-ljansson \
$(XLIB)
-test_exchange_api_revocation_cs_SOURCES = \
- test_exchange_api_revocation.c
-test_exchange_api_revocation_cs_LDADD = \
- libtalertesting.la \
- $(top_builddir)/src/lib/libtalerexchange.la \
- $(LIBGCRYPT_LIBS) \
- $(top_builddir)/src/bank-lib/libtalerfakebank.la \
- $(top_builddir)/src/bank-lib/libtalerbank.la \
- $(top_builddir)/src/json/libtalerjson.la \
- $(top_builddir)/src/util/libtalerutil.la \
- -lgnunetcurl \
- -lgnunetutil \
- -ljansson \
- $(XLIB)
-
-test_exchange_api_revocation_rsa_SOURCES = \
- test_exchange_api_revocation.c
-test_exchange_api_revocation_rsa_LDADD = \
- libtalertesting.la \
- $(top_builddir)/src/lib/libtalerexchange.la \
- $(LIBGCRYPT_LIBS) \
- $(top_builddir)/src/bank-lib/libtalerfakebank.la \
- $(top_builddir)/src/bank-lib/libtalerbank.la \
- $(top_builddir)/src/json/libtalerjson.la \
- $(top_builddir)/src/util/libtalerutil.la \
- -lgnunetcurl \
- -lgnunetutil \
- -ljansson \
- $(XLIB)
+# FIXME_9828
+# test_exchange_api_revocation_cs_SOURCES = \
+# test_exchange_api_revocation.c
+# test_exchange_api_revocation_cs_LDADD = \
+# libtalertesting.la \
+# $(top_builddir)/src/lib/libtalerexchange.la \
+# $(LIBGCRYPT_LIBS) \
+# $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+# $(top_builddir)/src/bank-lib/libtalerbank.la \
+# $(top_builddir)/src/json/libtalerjson.la \
+# $(top_builddir)/src/util/libtalerutil.la \
+# -lgnunetcurl \
+# -lgnunetutil \
+# -ljansson \
+# $(XLIB)
+
+# FIXME_9828
+# test_exchange_api_revocation_rsa_SOURCES = \
+# test_exchange_api_revocation.c
+# test_exchange_api_revocation_rsa_LDADD = \
+# libtalertesting.la \
+# $(top_builddir)/src/lib/libtalerexchange.la \
+# $(LIBGCRYPT_LIBS) \
+# $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+# $(top_builddir)/src/bank-lib/libtalerbank.la \
+# $(top_builddir)/src/json/libtalerjson.la \
+# $(top_builddir)/src/util/libtalerutil.la \
+# -lgnunetcurl \
+# -lgnunetutil \
+# -ljansson \
+# $(XLIB)
test_exchange_api_overlapping_keys_bug_cs_SOURCES = \
diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c
@@ -385,6 +385,7 @@ run (void *cls,
TALER_TESTING_cmd_end ()
};
+#if FIXME_9828
struct TALER_TESTING_Command recoup[] = {
/**
* Fill reserve with EUR:5.01, as withdraw fee is 1 ct per
@@ -478,7 +479,7 @@ run (void *cls,
"EUR:0.5"),
TALER_TESTING_cmd_end ()
};
-
+#endif
struct TALER_TESTING_Command massive_deposit_confirms[] = {
@@ -678,8 +679,10 @@ run (void *cls,
unaggregation),
TALER_TESTING_cmd_batch ("refund",
refund),
+#if FIXME_9828
TALER_TESTING_cmd_batch ("recoup",
recoup),
+#endif
// CMD_RUN_AUDITOR ("normal-auditor"),
TALER_TESTING_cmd_end ()
};
diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
@@ -913,6 +913,7 @@ run (void *cls,
TALER_TESTING_cmd_end ()
};
+#if FIXME_9828
struct TALER_TESTING_Command recoup[] = {
/**
* Fill reserve with EUR:5.01, as withdraw fee is 1 ct per
@@ -1217,6 +1218,7 @@ run (void *cls,
TALER_TESTING_cmd_end ()
};
+#endif
/**
* Test batch withdrawal plus spending.
@@ -1365,8 +1367,10 @@ run (void *cls,
refund),
TALER_TESTING_cmd_batch ("batch-withdraw",
batch_withdraw),
+#if FIXME_9828
TALER_TESTING_cmd_batch ("recoup",
recoup),
+#endif
TALER_TESTING_cmd_batch ("reserve-open-close",
reserve_open_close),
/* End the suite. */
