commit 922e072e03663adb0488f6b8785954ff1b60986f parent 08ba86d4ee0e6b5e7f01f78eccb84ea2ccaca57e Author: Christian Grothoff <christian@grothoff.org> Date: Tue, 15 Apr 2025 14:51:31 +0200 more fixes to KYC helpers Diffstat:
8 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd.h b/src/exchange/taler-exchange-httpd.h @@ -305,8 +305,8 @@ struct TEH_RequestHandler * @return MHD result code */ MHD_RESULT - (*delete)(struct TEH_RequestContext *rc, - const char *const args[]); + (*delete)(struct TEH_RequestContext *rc, + const char *const args[]); } handler; @@ -340,6 +340,7 @@ struct TEH_RequestHandler * and calling with fewer arguments could be OK? */ bool nargs_is_upper_bound; + }; diff --git a/src/kyclogic/taler-exchange-helper-measure-defaults-but-investigate b/src/kyclogic/taler-exchange-helper-measure-defaults-but-investigate @@ -93,4 +93,4 @@ DEFAULT_RULES=$(jq '.default_rules') exec jq -n \ --argjson dr "$DEFAULT_RULES" \ - '{"new_rules":$dr,"to_investigate":true}' + '{"new_rules":($dr+{"custom_measures":({}+$nr.custom_measures)}),"to_investigate":true}' diff --git a/src/kyclogic/taler-exchange-helper-measure-enable-deposits b/src/kyclogic/taler-exchange-helper-measure-enable-deposits @@ -123,6 +123,6 @@ jq -n \ --argjson et "$EXPIRATION_TIME" \ --argjson sm "$SUCCESSOR_MEASURE" \ --argjson nr "$NEW_RULES" \ - '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm})}|del(..|nulls)' + '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":{}})}|del(..|nulls)' exit 0 diff --git a/src/kyclogic/taler-exchange-helper-measure-preserve-but-investigate b/src/kyclogic/taler-exchange-helper-measure-preserve-but-investigate @@ -93,4 +93,4 @@ CURRENT_RULES=$(jq '.current_rules') exec jq -n \ --argjson cr "$CURRENT_RULES" \ - '{"new_rules":$cr,"to_investigate":true}' + '{"new_rules":($cr+{"custom_measures":({}+$cr.custom_measures)}),"to_investigate":true}' diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-3rdparty-check b/src/kyclogic/taler-exchange-helper-measure-tops-3rdparty-check @@ -142,6 +142,4 @@ jq -n \ --argjson nr "$NEW_RULES" \ '{"to_investigate":$inv,"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm)})}|del(..|nulls)' -# FIXME: If we keep nr.custom_measures in "custom_measures", should we not ".del()" them from "new_rules"? - exit 0 diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-kyx-check b/src/kyclogic/taler-exchange-helper-measure-tops-kyx-check @@ -156,6 +156,6 @@ jq -n \ --argjson et "$EXPIRATION_TIME" \ --argjson sm "$SUCCESSOR_MEASURE" \ --argjson nr "$NEW_RULES" \ - '{"to_investigate":$inv,"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":($nr.custom_measures)})}|del(..|nulls)' + '{"to_investigate":$inv,"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures)})}|del(..|nulls)' exit 0 diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-postal-check b/src/kyclogic/taler-exchange-helper-measure-tops-postal-check @@ -121,5 +121,4 @@ jq -n \ --argjson nr "$NEW_RULES" \ '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm)})}|del(..|nulls)' -# FIXME: If we keep nr.custom_measures in "custom_measures", should we not ".del()" them from "new_rules"? exit 0 diff --git a/src/kyclogic/taler-exchange-helper-measure-tops-sms-check b/src/kyclogic/taler-exchange-helper-measure-tops-sms-check @@ -126,5 +126,3 @@ exec jq -n \ --argjson nr "$NEW_RULES" \ --argjson inv "$TO_INVESTIGATE" \ '{"new_rules":($nr+{"expiration_time":$et,"successor_measure":$sm,"custom_measures":({}+$nr.custom_measures+$cm)}),"to_investigate":$inv}|del(..|nulls)' - -# FIXME: If we keep nr.custom_measures in "custom_measures", should we not ".del()" them from "new_rules"?