exchange

commit 7456ab2b9c925801aab70c53e530105ef28c540d
parent 8296816c8f622ed5171f005f68894aac8427b356
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon,  5 May 2025 20:02:48 +0200

removing brain fart, setting to investigate on challenger validating invalid addresses

Diffstat:
M
src/kyclogic/taler-exchange-helper-measure-tops-postal-check
 | 
10
+++++-----
M
src/kyclogic/taler-exchange-helper-measure-tops-sms-check
 | 
16
++--------------

2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-postal-check b/src/kyclogic/taler-exchange-helper-measure-tops-postal-check
@@ -104,21 +104,21 @@ then
     # Valid country
     # Remove limitation from current rules.
     NEW_RULES=$(echo "$CURRENT_RULES" | jq 'del(.rules[] | select ((.rule_name=="p2p-domestic-identification-requirement") or (.rule_name=="withdraw-limit-low") ))')
-
+    TO_INVESTIGATE="false"
 else
     # Invalid country
     echo "Country ${COUNTRY} invalid." 1>&2
     NEW_RULES="$CURRENT_RULES"
+    TO_INVESTIGATE="true"
 fi
 
 # Finally, output the new rules.
 # See https://docs.taler.net/taler-kyc-manual.html#tsref-type-AmlOutcome
 # for the required output format.
-jq -n \
+exec jq -n \
     --argjson et "$EXPIRATION_TIME" \
     --argjson sm "$SUCCESSOR_MEASURE" \
     --argjson cm "$CUSTOM_MEASURES" \
     --argjson nr "$NEW_RULES" \
-    '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm)})}|del(..|nulls)'
-
-exit 0
+    --argjson inv "$TO_INVESTIGATE" \
+    '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm)}),"to_investigate":$inv}|del(..|nulls)'
diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-sms-check b/src/kyclogic/taler-exchange-helper-measure-tops-sms-check
@@ -103,7 +103,7 @@ then
     # Remove limitation from current rules.
     NEW_RULES=$(echo "$CURRENT_RULES" | jq 'del(.rules[] | select ((.rule_name=="p2p-domestic-identification-requirement") or (.rule_name=="withdraw-limit-low") ))')
 
-    # Remove test rules that should now be satisfied
+# Remove test rules that should now be satisfied
 NEW_RULES=$(echo "$NEW_RULES" | jq 'del(.rules[] | select (.rule_name=="balance-testing-limit1") )')
 
     TO_INVESTIGATE="false"
@@ -114,17 +114,6 @@ else
     TO_INVESTIGATE="true"
 fi
 
-# Convert phone data to Challenger format as best we can.
-ADDRESS=$(jq -n \
-    --argjson phone_number \""$PHONE_NUMBER"\" \
-    '{"CONTACT_PHONE":$phone_number,"read_only":true}')
-
-
-# Define custom measure for address validation
-CUSTOM_PMEASURES=$(jq -n \
-    --argjson address "$ADDRESS" \
-    '{"custom-phone-investigation":{"context":{"initial_address":$address,"exec_name":"taler-exchange-helper-measure-inform-investigate","clear_measure":"custom-phone-investigation"},"check_name":"sms-registration","prog_name":"taler-exchange-helper-measure-clear-continue","operation_type":"MERGE"}}')
-
 
 # Finally, output the new rules.
 # See https://docs.taler.net/taler-kyc-manual.html#tsref-type-AmlOutcome
@@ -134,7 +123,6 @@ exec jq -n \
     --argjson et "$EXPIRATION_TIME" \
     --argjson sm "$SUCCESSOR_MEASURE" \
     --argjson cm "$CUSTOM_MEASURES" \
-    --argjson cmp "$CUSTOM_PMEASURES" \
     --argjson nr "$NEW_RULES" \
     --argjson inv "$TO_INVESTIGATE" \
-    '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm+$cmp)}),"to_investigate":$inv}|del(..|nulls)'
+    '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm)}),"to_investigate":$inv}|del(..|nulls)'