get rid of new_check remnants, it has long been replaced by new_measures

6 files changed, 29 insertions, 15 deletions

diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index a068d4f9c..6edc15d5c 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -2718,7 +2718,7 @@ TALER_officer_aml_query_verify (
  * @param new_rules new KYC rules to apply to the account
  *         Must be a "LegitimizationRuleSet".
  * @param properties properties of the account, can be NULL
- * @param new_check new KYC check to run, NULL for none
+ * @param new_measures new measures to apply immediately, NULL for none
  * @param to_investigate true if the account should be investigated by AML staff
  * @param officer_priv private key of AML officer
  * @param[out] officer_sig where to write the signature
@@ -2730,7 +2730,7 @@ TALER_officer_aml_decision_sign (
   const struct TALER_NormalizedPaytoHashP *h_payto,
   const json_t *new_rules,
   const json_t *properties,
-  const char *new_check,
+  const char *new_measures,
   bool to_investigate,
   const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
   struct TALER_AmlOfficerSignatureP *officer_sig);
@@ -2745,7 +2745,7 @@ TALER_officer_aml_decision_sign (
  *                      decision is about
  * @param new_rules new KYC rules to apply to the account
  * @param properties properties of the account, can be NULL
- * @param new_check new KYC check to run, NULL for none
+ * @param new_measures new measures to apply immediately, NULL for none
  * @param to_investigate true if the account should be investigated by AML staff
  * @param officer_pub public key of AML officer
  * @param officer_sig signature to verify
@@ -2758,7 +2758,7 @@ TALER_officer_aml_decision_verify (
   const struct TALER_NormalizedPaytoHashP *h_payto,
   const json_t *new_rules,
   const json_t *properties,
-  const char *new_check,
+  const char *new_measures,
   bool to_investigate,
   const struct TALER_AmlOfficerPublicKeyP *officer_pub,
   const struct TALER_AmlOfficerSignatureP *officer_sig);
diff --git a/src/kyclogic/taler-exchange-helper-measure-freeze b/src/kyclogic/taler-exchange-helper-measure-freeze
index 9be652372..1e2e83070 100755
--- a/src/kyclogic/taler-exchange-helper-measure-freeze
+++ b/src/kyclogic/taler-exchange-helper-measure-freeze
@@ -85,12 +85,11 @@ EXPIRATION=$((3600 * 30 + $(date +%s)))
 # See https://docs.taler.net/taler-exchange-manual.html#tsref-type-AmlOutcome
 # for the required output format.
 
-# NOTE: new_check is not yet supported! #9124
 jq -n \
     --arg expiration "$EXPIRATION" \
     '{ "to_investigate": true,
        "new_rules" : {
-         "new_check" : "info-frozen",
+         "new_measures" : "info-frozen",
          "custom_measures" : {},
          "expiration_time" : { "t_s": $expiration },
          "rules" : [
diff --git a/src/kyclogic/taler-exchange-helper-measure-test-form b/src/kyclogic/taler-exchange-helper-measure-test-form
index f5bd3767a..c9835dcbf 100755
--- a/src/kyclogic/taler-exchange-helper-measure-test-form
+++ b/src/kyclogic/taler-exchange-helper-measure-test-form
@@ -102,13 +102,12 @@ CURRENCY=$(taler-config -c $CONF -s taler -o currency)
 # See https://docs.taler.net/taler-exchange-manual.html#tsref-type-AmlOutcome
 # for the required output format.
 
-# NOTE: new_check is not yet supported! #9124
 jq -n \
     --argjson expiration "$EXPIRATION" \
     --arg currency "$CURRENCY" \
     '{ "to_investigate": false,
        "new_rules" : {
-         "new_check" : "info-oauth-test-passed",
+         "new_measures" : "info-oauth-test-passed",
          "custom_measures" : {},
          "expiration_time" : { "t_s": $expiration },
          "rules" : [
diff --git a/src/kyclogic/taler-exchange-helper-measure-test-oauth b/src/kyclogic/taler-exchange-helper-measure-test-oauth
index fcdaa255d..2b7bf69c9 100755
--- a/src/kyclogic/taler-exchange-helper-measure-test-oauth
+++ b/src/kyclogic/taler-exchange-helper-measure-test-oauth
@@ -98,13 +98,11 @@ EXPIRATION=$((3600 * 30 + $(date +%s)))
 # See https://docs.taler.net/taler-exchange-manual.html#tsref-type-AmlOutcome
 # for the required output format.
 
-# NOTE: new_check is not yet supported! #9124
-
 jq -n \
     --argjson expiration "$EXPIRATION" \
     '{ "to_investigate": false,
        "new_rules" : {
-         "new_check" : "info-oauth-test-passed",
+         "new_measures" : "info-oauth-test-passed",
          "custom_measures" : {},
          "expiration_time" : { "t_s": $expiration },
          "rules" : [
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index 0f03a8c79..0bbf5cea8 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -124,6 +124,7 @@ PROVIDER_ID = test-oauth2
 # Outputs from this check
 OUTPUTS = full_name birthdate
 
+
 [kyc-check-test-form]
 VOLUNTARY = NO
 # We use an external provider
@@ -169,6 +170,13 @@ REQUIRES =
 # where we are: frozen.
 FALLBACK = manual-freeze
 
+[kyc-measure-info-frozen]
+CHECK_NAME = kyc-check-info-frozen
+# No context
+CONTEXT = {}
+# Command if INFO check will never be run.
+COMMAND = taler-exchange-helper-measure-none
+
 # If this "check" is triggered, we merely inform
 # the user that we got their oauth-test data on file.
 [kyc-check-info-oauth-test-passed]
@@ -183,6 +191,15 @@ REQUIRES =
 # where we are: frozen.
 FALLBACK = manual-freeze
 
+
+[kyc-measure-info-oauth-test-passed]
+CHECK_NAME = kyc-check-info-oauth-test-passed
+# No context
+CONTEXT = {}
+# Command if INFO check will never be run.
+COMMAND = taler-exchange-helper-measure-none
+
+
 [aml-program-oauth-output-check]
 DESCRIPTION = "Validates the output from OAauth2 and then increases all limits to EUR:1000"
 # Command that runs on the output of the OAuth provider
@@ -191,6 +208,7 @@ COMMAND = taler-exchange-helper-measure-test-oauth
 # What measure to take if the COMMAND failed.
 FALLBACK = manual-freeze
 
+
 [aml-program-test-form-check]
 DESCRIPTION = "Validates the output from the test-form and then increases all limits to EUR:1000"
 # Command that runs on the output of the form
diff --git a/src/util/aml_signatures.c b/src/util/aml_signatures.c
index cbde36637..54e1c99f7 100644
--- a/src/util/aml_signatures.c
+++ b/src/util/aml_signatures.c
@@ -119,7 +119,7 @@ TALER_officer_aml_decision_verify (
   const struct TALER_NormalizedPaytoHashP *h_payto,
   const json_t *new_rules,
   const json_t *properties,
-  const char *new_measure,
+  const char *new_measures,
   bool to_investigate,
   const struct TALER_AmlOfficerPublicKeyP *officer_pub,
   const struct TALER_AmlOfficerSignatureP *officer_sig)
@@ -140,9 +140,9 @@ TALER_officer_aml_decision_verify (
                      &ad.h_properties);
   TALER_json_hash (new_rules,
                    &ad.h_new_rules);
-  if (NULL != new_measure)
-    GNUNET_CRYPTO_hash (new_measure,
-                        strlen (new_measure),
+  if (NULL != new_measures)
+    GNUNET_CRYPTO_hash (new_measures,
+                        strlen (new_measures),
                         &ad.h_new_measure);
   return GNUNET_CRYPTO_eddsa_verify (
     TALER_SIGNATURE_AML_DECISION,