replace requirement row with H_PAYTO

4 files changed, 15 insertions, 7 deletions

diff --git a/src/testing/testing_api_cmd_kyc_check_get.c b/src/testing/testing_api_cmd_kyc_check_get.c
index 981570153..7d0ce06b1 100644
--- a/src/testing/testing_api_cmd_kyc_check_get.c
+++ b/src/testing/testing_api_cmd_kyc_check_get.c
@@ -120,7 +120,7 @@ check_kyc_run (void *cls,
   struct KycCheckGetState *kcg = cls;
   const struct TALER_TESTING_Command *res_cmd;
   const struct TALER_TESTING_Command *acc_cmd;
-  const uint64_t *requirement_row;
+  const struct TALER_PaytoHashP *h_payto;
   const union TALER_AccountPrivateKeyP *account_priv;
 
   (void) cmd;
@@ -144,9 +144,9 @@ check_kyc_run (void *cls,
     return;
   }
   if (GNUNET_OK !=
-      TALER_TESTING_get_trait_legi_requirement_row (
+      TALER_TESTING_get_trait_h_payto (
         res_cmd,
-        &requirement_row))
+        &h_payto))
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (kcg->is);
@@ -160,7 +160,7 @@ check_kyc_run (void *cls,
     TALER_TESTING_interpreter_fail (kcg->is);
     return;
   }
-  if (0 == *requirement_row)
+  if (0 == h_payto)
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (kcg->is);
@@ -169,7 +169,7 @@ check_kyc_run (void *cls,
   kcg->kwh = TALER_EXCHANGE_kyc_check (
     TALER_TESTING_interpreter_get_context (is),
     TALER_TESTING_get_exchange_url (is),
-    *requirement_row,
+    h_payto,
     account_priv,
     GNUNET_TIME_UNIT_ZERO,
     &check_kyc_cb,
diff --git a/src/testing/testing_api_cmd_kyc_wallet_get.c b/src/testing/testing_api_cmd_kyc_wallet_get.c
index 48b5211e7..24bd7d4d7 100644
--- a/src/testing/testing_api_cmd_kyc_wallet_get.c
+++ b/src/testing/testing_api_cmd_kyc_wallet_get.c
@@ -65,13 +65,13 @@ struct KycWalletGetState
 
   /**
    * Set to the KYC requirement payto hash *if* the exchange replied with a
-   * request for KYC (#MHD_HTTP_OK).
+   * request for KYC (#MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS).
    */
   struct TALER_PaytoHashP h_payto;
 
   /**
    * Set to the KYC requirement row *if* the exchange replied with
-   * a request for KYC (#MHD_HTTP_OK).
+   * request for KYC (#MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS).
    */
   uint64_t requirement_row;
 
diff --git a/src/testing/testing_api_cmd_purse_merge.c b/src/testing/testing_api_cmd_purse_merge.c
index cf9d4f996..515a14403 100644
--- a/src/testing/testing_api_cmd_purse_merge.c
+++ b/src/testing/testing_api_cmd_purse_merge.c
@@ -171,6 +171,10 @@ merge_cb (void *cls,
     /* KYC required */
     ds->requirement_row =
       dr->details.unavailable_for_legal_reasons.requirement_row;
+    GNUNET_break (0 ==
+                  GNUNET_memcmp (
+                    &ds->h_payto,
+                    &dr->details.unavailable_for_legal_reasons.h_payto));
     break;
   }
 
diff --git a/src/testing/testing_api_cmd_reserve_purse.c b/src/testing/testing_api_cmd_reserve_purse.c
index 923542082..a083711f6 100644
--- a/src/testing/testing_api_cmd_reserve_purse.c
+++ b/src/testing/testing_api_cmd_reserve_purse.c
@@ -164,6 +164,10 @@ purse_cb (void *cls,
     /* KYC required */
     ds->requirement_row =
       dr->details.unavailable_for_legal_reasons.requirement_row;
+    GNUNET_break (0 ==
+                  GNUNET_memcmp (
+                    &ds->h_payto,
+                    &dr->details.unavailable_for_legal_reasons.h_payto));
     break;
   }
   TALER_TESTING_interpreter_next (ds->is);