From a17781ba8d5f875b5150e524174c5f144aa6c0ba Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 4 Jun 2022 21:59:55 +0200
Subject: -more work on p2p payments and tests thereof

---
 src/exchange/taler-exchange-httpd_purses_merge.c | 30 +++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/exchange/taler-exchange-httpd_purses_merge.c')

diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c
index 14dba523..d87fb16d 100644
--- a/src/exchange/taler-exchange-httpd_purses_merge.c
+++ b/src/exchange/taler-exchange-httpd_purses_merge.c
@@ -226,19 +226,20 @@ merge_transaction (void *cls,
   bool no_kyc = true;
   bool no_reserve = true;
 
-  // FIXME: add KYC-check logic!
-  qs = TEH_plugin->do_purse_merge (TEH_plugin->cls,
-                                   pcc->purse_pub,
-                                   &pcc->merge_sig,
-                                   pcc->merge_timestamp,
-                                   &pcc->reserve_sig,
-                                   pcc->provider_url,
-                                   &pcc->reserve_pub,
-                                   &no_partner,
-                                   &no_balance,
-                                   &no_reserve,
-                                   &no_kyc,
-                                   &in_conflict);
+  qs = TEH_plugin->do_purse_merge (
+    TEH_plugin->cls,
+    pcc->purse_pub,
+    &pcc->merge_sig,
+    pcc->merge_timestamp,
+    &pcc->reserve_sig,
+    pcc->provider_url,
+    &pcc->reserve_pub,
+    TEH_KYC_NONE != TEH_kyc_config.mode,
+    &no_partner,
+    &no_balance,
+    &no_reserve,
+    &no_kyc,
+    &in_conflict);
   if (qs < 0)
   {
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -270,7 +271,8 @@ merge_transaction (void *cls,
                                   NULL);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
-  if (no_kyc)
+  if ( (no_kyc) &&
+       (TEH_KYC_NONE != TEH_kyc_config.mode) )
   {
     *mhd_ret
       = TALER_MHD_REPLY_JSON_PACK (
-- 
cgit v1.2.3