exchange

commit eefae693c645a0377e1307082adb5c129aad0245
parent 1b8b3a69f85877658def5d052508e26a97f7f4fd
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 12 Sep 2024 15:37:02 +0200

remove dead CONVERTER option (#9126)

Diffstat:
M
src/kyclogic/kyclogic-kycaid.conf
 | 
4
----
M
src/kyclogic/kyclogic-oauth2.conf
 | 
3
---
M
src/kyclogic/kyclogic_api.c
 | 
25
-------------------------
M
src/testing/test_exchange_api.conf
 | 
1
-
M
src/testing/test_exchange_api_age_restriction.conf
 | 
1
-

5 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/src/kyclogic/kyclogic-kycaid.conf b/src/kyclogic/kyclogic-kycaid.conf
@@ -9,10 +9,6 @@ LOGIC = kycaid
 USER_TYPE = INDIVIDUAL
 PROVIDED_CHECKS = EXAMPLE_DO_NOT_USE
 
-# Generic converter that does nothing.
-CONVERTER = cat
-
-
 # How long is the KYC check valid?
 KYC_KYCAID_VALIDITY = forever
 
diff --git a/src/kyclogic/kyclogic-oauth2.conf b/src/kyclogic/kyclogic-oauth2.conf
@@ -9,9 +9,6 @@ LOGIC = oauth2
 USER_TYPE = INDIVIDUAL
 PROVIDED_CHECKS = EXAMPLE_DO_NOT_USE
 
-# Generic converter.
-CONVERTER = cat
-
 # Converter that converts OAuth2.0 data about the user
 # into GNU Taler standardized attribute data.
 #
diff --git a/src/kyclogic/kyclogic_api.c b/src/kyclogic/kyclogic_api.c
@@ -40,12 +40,6 @@ struct TALER_KYCLOGIC_KycProvider
   char *provider_name;
 
   /**
-   * Name of a program to run to convert output of the
-   * plugin into the desired set of attributes.
-   */
-  char *converter_name;
-
-  /**
    * Logic to run for this provider.
    */
   struct TALER_KYCLOGIC_Plugin *logic;
@@ -1540,7 +1534,6 @@ add_provider (const struct GNUNET_CONFIGURATION_Handle *cfg,
               const char *section)
 {
   char *logic;
-  char *converter;
   struct TALER_KYCLOGIC_Plugin *lp;
   struct TALER_KYCLOGIC_ProviderDetails *pd;
 
@@ -1550,24 +1543,12 @@ add_provider (const struct GNUNET_CONFIGURATION_Handle *cfg,
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              section,
-                                             "CONVERTER",
-                                             &converter))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               section,
-                               "CONVERTER");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             section,
                                              "LOGIC",
                                              &logic))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                section,
                                "LOGIC");
-    GNUNET_free (converter);
     return GNUNET_SYSERR;
   }
   lp = load_logic (cfg,
@@ -1579,17 +1560,13 @@ add_provider (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                "LOGIC",
                                "logic plugin could not be loaded");
     GNUNET_free (logic);
-    GNUNET_free (converter);
     return GNUNET_SYSERR;
   }
   GNUNET_free (logic);
   pd = lp->load_configuration (lp->cls,
                                section);
   if (NULL == pd)
-  {
-    GNUNET_free (converter);
     return GNUNET_SYSERR;
-  }
 
   {
     struct TALER_KYCLOGIC_KycProvider *kp;
@@ -1597,7 +1574,6 @@ add_provider (const struct GNUNET_CONFIGURATION_Handle *cfg,
     kp = GNUNET_new (struct TALER_KYCLOGIC_KycProvider);
     kp->provider_name
       = GNUNET_strdup (&section[strlen ("kyc-provider-")]);
-    kp->converter_name = converter;
     kp->logic = lp;
     kp->pd = pd;
     GNUNET_array_append (kyc_providers,
@@ -2551,7 +2527,6 @@ TALER_KYCLOGIC_kyc_done (void)
 
     kp->logic->unload_configuration (kp->pd);
     GNUNET_free (kp->provider_name);
-    GNUNET_free (kp->converter_name);
     GNUNET_free (kp);
   }
   GNUNET_array_grow (kyc_providers,
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
@@ -98,7 +98,6 @@ WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 
 [kyc-provider-test-oauth2]
 LOGIC = oauth2
-CONVERTER = taler-exchange-helper-converter-oauth2-address
 KYC_OAUTH2_VALIDITY = forever
 KYC_OAUTH2_TOKEN_URL = http://localhost:6666/oauth/v2/token
 KYC_OAUTH2_AUTHORIZE_URL = http://localhost:6666/oauth/v2/login
diff --git a/src/testing/test_exchange_api_age_restriction.conf b/src/testing/test_exchange_api_age_restriction.conf
@@ -81,7 +81,6 @@ ENABLED = YES
 
 [kyc-provider-test-oauth2]
 LOGIC = oauth2
-CONVERTER = taler-exchange-helper-converter-oauth2-address
 KYC_OAUTH2_VALIDITY = forever
 KYC_OAUTH2_TOKEN_URL = http://localhost:6666/oauth/v2/token
 KYC_OAUTH2_AUTHORIZE_URL = http://localhost:6666/oauth/v2/login