[taler-exchange] branch master updated: add AGGREGATE to aml progs

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 181596436 add AGGREGATE to aml progs
181596436 is described below

commit 1815964368c4b4456f2f10555cf4b5a8a6f0fc47
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Aug 8 23:29:21 2024 +0200

    add AGGREGATE to aml progs
---
 src/kyclogic/kyclogic_api.c                           | 6 ++++--
 src/kyclogic/taler-exchange-helper-measure-freeze     | 9 +++++++++
 src/kyclogic/taler-exchange-helper-measure-test-form  | 9 +++++++++
 src/kyclogic/taler-exchange-helper-measure-test-oauth | 9 +++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/kyclogic/kyclogic_api.c b/src/kyclogic/kyclogic_api.c
index 598cd50e9..43604a206 100644
--- a/src/kyclogic/kyclogic_api.c
+++ b/src/kyclogic/kyclogic_api.c
@@ -2703,8 +2703,10 @@ check_amount (
     if (ktc->event != rule->trigger)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Wrong event type for rule %u\n",
-                  i);
+                  "Wrong event type (%d) for rule %u (%d)\n",
+                  (int) ktc->event,
+                  i,
+                  (int) rule->trigger);
       continue; /* wrong trigger event type */
     }
     if (GNUNET_TIME_relative_cmp (dur,
diff --git a/src/kyclogic/taler-exchange-helper-measure-freeze 
b/src/kyclogic/taler-exchange-helper-measure-freeze
index 02f8b423d..5b2fc554f 100755
--- a/src/kyclogic/taler-exchange-helper-measure-freeze
+++ b/src/kyclogic/taler-exchange-helper-measure-freeze
@@ -71,6 +71,15 @@ jq -n \
              "exposed" : false,
              "is_and_combinator" : true
            },
+           {
+             "operation_type": "AGGREGATE",
+             "threshold" : "EUR:0",
+             "timeframe" : { "d_us" : 3600000000 },
+             "measures" : [ "verboten" ],
+             "display_priority" : 1,
+             "exposed" : false,
+             "is_and_combinator" : true
+           },
            {
              "operation_type": "MERGE",
              "threshold" : "EUR:0",
diff --git a/src/kyclogic/taler-exchange-helper-measure-test-form 
b/src/kyclogic/taler-exchange-helper-measure-test-form
index d231e6244..c5895a833 100755
--- a/src/kyclogic/taler-exchange-helper-measure-test-form
+++ b/src/kyclogic/taler-exchange-helper-measure-test-form
@@ -88,6 +88,15 @@ jq -n \
            "exposed" : true,
            "is_and_combinator" : true
          },
+         {
+           "operation_type": "AGGREGATE",
+           "threshold" : "EUR:1000",
+           "timeframe" : { "d_us" : 3600000000 },
+           "measures" : [ "verboten" ],
+           "display_priority" : 1,
+           "exposed" : true,
+           "is_and_combinator" : true
+         },
          {
            "operation_type": "MERGE",
            "threshold" : "EUR:1000",
diff --git a/src/kyclogic/taler-exchange-helper-measure-test-oauth 
b/src/kyclogic/taler-exchange-helper-measure-test-oauth
index 554a179b6..959ac1b8d 100755
--- a/src/kyclogic/taler-exchange-helper-measure-test-oauth
+++ b/src/kyclogic/taler-exchange-helper-measure-test-oauth
@@ -88,6 +88,15 @@ jq -n \
            "exposed" : true,
            "is_and_combinator" : true
          },
+         {
+           "operation_type": "AGGREGATE",
+           "threshold" : "EUR:1000",
+           "timeframe" : { "d_us" : 3600000000 },
+           "measures" : [ "verboten" ],
+           "display_priority" : 1,
+           "exposed" : true,
+           "is_and_combinator" : true
+         },
          {
            "operation_type": "MERGE",
            "threshold" : "EUR:1000",

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.