working through kyclogic

5 files changed, 24 insertions, 23 deletions

diff --git a/src/kyclogic/plugin_kyclogic_kycaid.c b/src/kyclogic/plugin_kyclogic_kycaid.c
index fcf94984b..a5df10b4b 100644
--- a/src/kyclogic/plugin_kyclogic_kycaid.c
+++ b/src/kyclogic/plugin_kyclogic_kycaid.c
@@ -117,7 +117,7 @@ struct TALER_KYCLOGIC_InitiateHandle
    * Hash of the payto:// URI we are initiating
    * the KYC for.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * UUID being checked.
@@ -271,7 +271,7 @@ struct TALER_KYCLOGIC_WebhookHandle
   /**
    * Our account ID.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * Row in legitimizations for the given
@@ -578,7 +578,7 @@ handle_initiate_finished (void *cls,
 static struct TALER_KYCLOGIC_InitiateHandle *
 kycaid_initiate (void *cls,
                  const struct TALER_KYCLOGIC_ProviderDetails *pd,
-                 const struct TALER_PaytoHashP *account_id,
+                 const struct TALER_NormalizedPaytoHashP *account_id,
                  uint64_t legitimization_uuid,
                  TALER_KYCLOGIC_InitiateCallback cb,
                  void *cb_cls)
@@ -717,7 +717,7 @@ static struct TALER_KYCLOGIC_ProofHandle *
 kycaid_proof (void *cls,
               const struct TALER_KYCLOGIC_ProviderDetails *pd,
               struct MHD_Connection *connection,
-              const struct TALER_PaytoHashP *account_id,
+              const struct TALER_NormalizedPaytoHashP *account_id,
               uint64_t process_row,
               const char *provider_user_id,
               const char *provider_legitimization_id,
diff --git a/src/kyclogic/plugin_kyclogic_oauth2.c b/src/kyclogic/plugin_kyclogic_oauth2.c
index a94e8790b..bb3b9dad2 100644
--- a/src/kyclogic/plugin_kyclogic_oauth2.c
+++ b/src/kyclogic/plugin_kyclogic_oauth2.c
@@ -142,7 +142,7 @@ struct TALER_KYCLOGIC_InitiateHandle
    * Hash of the payto:// URI we are initiating
    * the KYC for.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * UUID being checked.
@@ -202,7 +202,7 @@ struct TALER_KYCLOGIC_ProofHandle
   /**
    * Hash of the payto URI that this is about.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * Continuation to call.
@@ -767,7 +767,7 @@ initiate_task (void *cls)
 static struct TALER_KYCLOGIC_InitiateHandle *
 oauth2_initiate (void *cls,
                  const struct TALER_KYCLOGIC_ProviderDetails *pd,
-                 const struct TALER_PaytoHashP *account_id,
+                 const struct TALER_NormalizedPaytoHashP *account_id,
                  uint64_t legitimization_uuid,
                  TALER_KYCLOGIC_InitiateCallback cb,
                  void *cb_cls)
@@ -1401,7 +1401,7 @@ static struct TALER_KYCLOGIC_ProofHandle *
 oauth2_proof (void *cls,
               const struct TALER_KYCLOGIC_ProviderDetails *pd,
               struct MHD_Connection *connection,
-              const struct TALER_PaytoHashP *account_id,
+              const struct TALER_NormalizedPaytoHashP *account_id,
               uint64_t process_row,
               const char *provider_user_id,
               const char *provider_legitimization_id,
diff --git a/src/kyclogic/plugin_kyclogic_persona.c b/src/kyclogic/plugin_kyclogic_persona.c
index 6b957756e..22abe7ca2 100644
--- a/src/kyclogic/plugin_kyclogic_persona.c
+++ b/src/kyclogic/plugin_kyclogic_persona.c
@@ -144,7 +144,7 @@ struct TALER_KYCLOGIC_InitiateHandle
   /**
    * Hash of the payto:// URI we are initiating the KYC for.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * UUID being checked.
@@ -245,7 +245,7 @@ struct TALER_KYCLOGIC_ProofHandle
   /**
    * Hash of the payto:// URI we are checking the KYC for.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * Row in the legitimization processes of the
@@ -346,7 +346,7 @@ struct TALER_KYCLOGIC_WebhookHandle
   /**
    * Our account ID.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * UUID being checked.
@@ -755,7 +755,7 @@ handle_initiate_finished (void *cls,
 static struct TALER_KYCLOGIC_InitiateHandle *
 persona_initiate (void *cls,
                   const struct TALER_KYCLOGIC_ProviderDetails *pd,
-                  const struct TALER_PaytoHashP *account_id,
+                  const struct TALER_NormalizedPaytoHashP *account_id,
                   uint64_t legitimization_uuid,
                   TALER_KYCLOGIC_InitiateCallback cb,
                   void *cb_cls)
@@ -1458,7 +1458,7 @@ static struct TALER_KYCLOGIC_ProofHandle *
 persona_proof (void *cls,
                const struct TALER_KYCLOGIC_ProviderDetails *pd,
                struct MHD_Connection *connection,
-               const struct TALER_PaytoHashP *account_id,
+               const struct TALER_NormalizedPaytoHashP *account_id,
                uint64_t process_row,
                const char *provider_user_id,
                const char *inquiry_id,
diff --git a/src/kyclogic/plugin_kyclogic_template.c b/src/kyclogic/plugin_kyclogic_template.c
index b7fce18a7..d91988941 100644
--- a/src/kyclogic/plugin_kyclogic_template.c
+++ b/src/kyclogic/plugin_kyclogic_template.c
@@ -86,7 +86,7 @@ struct TALER_KYCLOGIC_InitiateHandle
    * Hash of the payto:// URI we are initiating
    * the KYC for.
    */
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
 
   /**
    * UUID being checked.
@@ -242,7 +242,7 @@ template_initiate_cancel (struct TALER_KYCLOGIC_InitiateHandle *ih)
 static struct TALER_KYCLOGIC_InitiateHandle *
 template_initiate (void *cls,
                    const struct TALER_KYCLOGIC_ProviderDetails *pd,
-                   const struct TALER_PaytoHashP *account_id,
+                   const struct TALER_NormalizedPaytoHashP *account_id,
                    uint64_t legitimization_uuid,
                    TALER_KYCLOGIC_InitiateCallback cb,
                    void *cb_cls)
@@ -292,7 +292,7 @@ static struct TALER_KYCLOGIC_ProofHandle *
 template_proof (void *cls,
                 const struct TALER_KYCLOGIC_ProviderDetails *pd,
                 struct MHD_Connection *connection,
-                const struct TALER_PaytoHashP *account_id,
+                const struct TALER_NormalizedPaytoHashP *account_id,
                 uint64_t process_row,
                 const char *provider_user_id,
                 const char *provider_legitimization_id,
diff --git a/src/kyclogic/taler-exchange-kyc-tester.c b/src/kyclogic/taler-exchange-kyc-tester.c
index 14af603ab..33bc0eb0d 100644
--- a/src/kyclogic/taler-exchange-kyc-tester.c
+++ b/src/kyclogic/taler-exchange-kyc-tester.c
@@ -239,7 +239,7 @@ static char *TEKT_base_url;
 /**
  * Payto set via command-line (or otherwise random).
  */
-static struct TALER_PaytoHashP cmd_line_h_payto;
+static struct TALER_NormalizedPaytoHashP cmd_line_h_payto;
 
 /**
  * Provider user ID to use.
@@ -454,7 +454,7 @@ static void
 webhook_finished_cb (
   void *cls,
   uint64_t process_row,
-  const struct TALER_PaytoHashP *account_id,
+  const struct TALER_NormalizedPaytoHashP *account_id,
   const char *provider_section,
   const char *provider_user_id,
   const char *provider_legitimization_id,
@@ -565,7 +565,7 @@ kyc_provider_account_lookup (
   void *cls,
   const char *provider_section,
   const char *provider_legitimization_id,
-  struct TALER_PaytoHashP *h_payto,
+  struct TALER_NormalizedPaytoHashP *h_payto,
   uint64_t *legi_row)
 {
   (void) cls;
@@ -783,7 +783,7 @@ handler_kyc_proof_get (
   struct TEKT_RequestContext *rc,
   const char *const args[1])
 {
-  struct TALER_PaytoHashP h_payto;
+  struct TALER_NormalizedPaytoHashP h_payto;
   struct TALER_KYCLOGIC_ProviderDetails *pd;
   struct TALER_KYCLOGIC_Plugin *logic;
   struct ProofRequestState *rs;
@@ -1748,11 +1748,12 @@ run (void *cls,
 
 
 /**
- * The main function of the taler-exchange-httpd server ("the exchange").
+ * The main function of the taler-exchange-kyc-tester, a tool for
+ * testing KYC processes.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @return 0 ok, non-zero on error
  */
 int
 main (int argc,
@@ -1781,7 +1782,7 @@ main (int argc,
     GNUNET_GETOPT_option_flag (
       'P',
       "print-payto-hash",
-      "output the hash of the payto://-URI",
+      "output the hash of the (normalized) payto://-URI",
       &print_h_payto),
     GNUNET_GETOPT_option_base32_fixed_size (
       'p',