exchange

commit 5ef79bebc5adef77c94e5d0e77bfd57a71048cc2
parent 15cdd0ee05235648aa619e08c5c67b484ff631c4
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue,  7 May 2024 18:52:38 +0200

get reserves_purse to compile

Diffstat:
M
src/exchange/Makefile.am
 | 
2
+-
M
src/exchange/taler-exchange-httpd_purses_merge.c
 | 
8
+++++---
M
src/exchange/taler-exchange-httpd_reserves_purse.c
 | 
59
+++++++++++++++++------------------------------------------

3 files changed, 23 insertions(+), 46 deletions(-)
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
@@ -172,6 +172,7 @@ taler_exchange_httpd_SOURCES = \
   taler-exchange-httpd_reserves_get_attest.c taler-exchange-httpd_reserves_get_attest.h \
   taler-exchange-httpd_reserves_history.c taler-exchange-httpd_reserves_history.h \
   taler-exchange-httpd_reserves_open.c taler-exchange-httpd_reserves_open.h \
+  taler-exchange-httpd_reserves_purse.c taler-exchange-httpd_reserves_purse.h \
   taler-exchange-httpd_responses.c taler-exchange-httpd_responses.h \
   taler-exchange-httpd_spa.c taler-exchange-httpd_spa.h \
   taler-exchange-httpd_terms.c taler-exchange-httpd_terms.h \
@@ -179,7 +180,6 @@ taler_exchange_httpd_SOURCES = \
   taler-exchange-httpd_withdraw.c taler-exchange-httpd_withdraw.h
 
 #  taler-exchange-httpd_reserves_close.c taler-exchange-httpd_reserves_close.h \
-#  taler-exchange-httpd_reserves_purse.c taler-exchange-httpd_reserves_purse.h \
 #  taler-exchange-httpd_kyc-check.c taler-exchange-httpd_kyc-check.h \
 #  taler-exchange-httpd_kyc-wallet.c taler-exchange-httpd_kyc-wallet.h \
 #  taler-exchange-httpd_deposits_get.c taler-exchange-httpd_deposits_get.h \
diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c
@@ -240,9 +240,11 @@ amount_iterator (void *cls,
   struct PurseMergeContext *pcc = cls;
   enum GNUNET_DB_QueryStatus qs;
 
-  cb (cb_cls,
-      &pcc->target_amount,
-      GNUNET_TIME_absolute_get ());
+  if (GNUNET_OK !=
+      cb (cb_cls,
+          &pcc->target_amount,
+          GNUNET_TIME_absolute_get ()))
+    return;
   qs = TEH_plugin->select_merge_amounts_for_kyc_check (
     TEH_plugin->cls,
     &pcc->h_payto,
diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c b/src/exchange/taler-exchange-httpd_reserves_purse.c
@@ -31,6 +31,7 @@
 #include "taler_mhd_lib.h"
 #include "taler-exchange-httpd_reserves_purse.h"
 #include "taler-exchange-httpd_responses.h"
+#include "taler-exchange-httpd_withdraw.h"
 #include "taler_exchangedb_lib.h"
 #include "taler-exchange-httpd_keys.h"
 
@@ -152,9 +153,11 @@ amount_iterator (void *cls,
   struct ReservePurseContext *rpc = cls;
   enum GNUNET_DB_QueryStatus qs;
 
-  cb (cb_cls,
-      &rpc->deposit_total,
-      GNUNET_TIME_absolute_get ());
+  if (GNUNET_OK !=
+      cb (cb_cls,
+          &rpc->deposit_total,
+          GNUNET_TIME_absolute_get ()))
+    return;
   qs = TEH_plugin->select_merge_amounts_for_kyc_check (
     TEH_plugin->cls,
     &rpc->h_payto,
@@ -189,50 +192,22 @@ purse_transaction (void *cls,
 {
   struct ReservePurseContext *rpc = cls;
   enum GNUNET_DB_QueryStatus qs;
-  char *required;
+  union TALER_AccountPublicKeyP account_pub = {
+    .reserve_pub = *rpc->reserve_pub
+  };
 
-  qs = TALER_KYCLOGIC_kyc_test_required (
+  qs = TEH_legitimization_check (
+    &rpc->kyc,
+    connection,
+    mhd_ret,
     TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE,
     &rpc->h_payto,
-    TEH_plugin->select_satisfied_kyc_processes,
-    TEH_plugin->cls,
+    &account_pub,
     &amount_iterator,
-    rpc,
-    &required);
-  if (qs < 0)
-  {
-    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-      return qs;
-    GNUNET_break (0);
-    *mhd_ret =
-      TALER_MHD_reply_with_error (connection,
-                                  MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                  TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                  "kyc_test_required");
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if (NULL != required)
-  {
-    rpc->kyc.ok = false;
-    qs = TEH_plugin->insert_kyc_requirement_for_account (
-      TEH_plugin->cls,
-      required,
-      &rpc->h_payto,
-      rpc->reserve_pub,
-      &rpc->kyc.requirement_row);
-    GNUNET_free (required);
-    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-    {
-      GNUNET_break (0);
-      *mhd_ret
-        = TALER_MHD_reply_with_error (connection,
-                                      MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                      TALER_EC_GENERIC_DB_STORE_FAILED,
-                                      "insert_kyc_requirement_for_account");
-    }
+    rpc);
+  if ( (qs < 0) ||
+       (! rpc->kyc.ok) )
     return qs;
-  }
-  rpc->kyc.ok = true;
 
   {
     bool in_conflict = true;