[taler-exchange] branch master updated: -more consistent naming of KYC_PERSONA options

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new b41ffd1a -more consistent naming of KYC_PERSONA options
     new 1df72de0 Merge branch 'master' of git+ssh://git.taler.net/exchange
b41ffd1a is described below

commit b41ffd1a1af24efc244f7ed95dcc13c4b77bc56e
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jan 10 13:35:57 2023 +0100

    -more consistent naming of KYC_PERSONA options
---
 src/exchange/taler-exchange-httpd_responses.c |  4 ++--
 src/kyclogic/plugin_kyclogic_persona.c        | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_responses.c 
b/src/exchange/taler-exchange-httpd_responses.c
index 3a42ba75..c5fed44a 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -886,10 +886,10 @@ TEH_RESPONSE_compile_reserve_history (
                                             merge->merge_timestamp),
                 GNUNET_JSON_pack_timestamp ("purse_expiration",
                                             merge->purse_expiration),
-                TALER_JSON_pack_amount ("amount",
-                                        &merge->amount_with_fee),
                 TALER_JSON_pack_amount ("purse_fee",
                                         &merge->purse_fee),
+                TALER_JSON_pack_amount ("amount",
+                                        &merge->amount_with_fee),
                 GNUNET_JSON_pack_bool ("merged",
                                        merge->merged))))
         {
diff --git a/src/kyclogic/plugin_kyclogic_persona.c 
b/src/kyclogic/plugin_kyclogic_persona.c
index 651388c9..d0ce3d05 100644
--- a/src/kyclogic/plugin_kyclogic_persona.c
+++ b/src/kyclogic/plugin_kyclogic_persona.c
@@ -369,31 +369,31 @@ persona_load_configuration (void *cls,
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (ps->cfg,
                                            provider_section_name,
-                                           "PERSONA_VALIDITY",
+                                           "KYC_PERSONA_VALIDITY",
                                            &pd->validity))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                provider_section_name,
-                               "PERSONA_VALIDITY");
+                               "KYC_PERSONA_VALIDITY");
     persona_unload_configuration (pd);
     return NULL;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (ps->cfg,
                                              provider_section_name,
-                                             "PERSONA_AUTH_TOKEN",
+                                             "KYC_PERSONA_AUTH_TOKEN",
                                              &pd->auth_token))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                provider_section_name,
-                               "PERSONA_AUTH_TOKEN");
+                               "KYC_PERSONA_AUTH_TOKEN");
     persona_unload_configuration (pd);
     return NULL;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (ps->cfg,
                                              provider_section_name,
-                                             "SALT",
+                                             "KYC_PERSONA_SALT",
                                              &pd->salt))
   {
     uint32_t salt[8];
@@ -407,36 +407,36 @@ persona_load_configuration (void *cls,
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (ps->cfg,
                                              provider_section_name,
-                                             "PERSONA_SUBDOMAIN",
+                                             "KYC_PERSONA_SUBDOMAIN",
                                              &pd->subdomain))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                provider_section_name,
-                               "PERSONA_SUBDOMAIN");
+                               "KYC_PERSONA_SUBDOMAIN");
     persona_unload_configuration (pd);
     return NULL;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (ps->cfg,
                                              provider_section_name,
-                                             "KYC_POST_URL",
+                                             "KYC_PERSONA_POST_URL",
                                              &pd->post_kyc_redirect_url))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                provider_section_name,
-                               "KYC_POST_URL");
+                               "KYC_PERSONA_POST_URL");
     persona_unload_configuration (pd);
     return NULL;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (ps->cfg,
                                              provider_section_name,
-                                             "PERSONA_TEMPLATE_ID",
+                                             "KYC_PERSONA_TEMPLATE_ID",
                                              &pd->template_id))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                provider_section_name,
-                               "PERSONA_TEMPLATE_ID");
+                               "KYC_PERSONA_TEMPLATE_ID");
     persona_unload_configuration (pd);
     return NULL;
   }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.