diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/exchange/taler-exchange-aggregator.c | 2 | ||||
-rw-r--r-- | src/include/taler_kyclogic_lib.h | 8 | ||||
-rw-r--r-- | src/json/json_helper.c | 2 | ||||
-rw-r--r-- | src/kyclogic/kyclogic_api.c | 3 | ||||
-rw-r--r-- | src/testing/test_kyc_api.conf | 4 |
5 files changed, 15 insertions, 4 deletions
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index 5a7be23b5..145280d2a 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -532,7 +532,7 @@ legitimization_satisfied (struct AggregationUnit *au_active) struct TALER_Amount next_threshold; qs = TALER_KYCLOGIC_kyc_test_required ( - TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT, + TALER_KYCLOGIC_KYC_TRIGGER_AGGREGATE, lrs, &return_relevant_amounts, (void *) au_active, diff --git a/src/include/taler_kyclogic_lib.h b/src/include/taler_kyclogic_lib.h index d146b0c57..4302ab09a 100644 --- a/src/include/taler_kyclogic_lib.h +++ b/src/include/taler_kyclogic_lib.h @@ -61,7 +61,13 @@ enum TALER_KYCLOGIC_KycTriggerEvent /** * Reserve is being closed by force. */ - TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE = 5 + TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE = 5, + + /** + * Deposits have been aggregated, we are wiring a + * certain amount into a (merchant) bank account. + */ + TALER_KYCLOGIC_KYC_TRIGGER_AGGREGATE = 6 }; diff --git a/src/json/json_helper.c b/src/json/json_helper.c index e633a39c7..82cc13413 100644 --- a/src/json/json_helper.c +++ b/src/json/json_helper.c @@ -1473,6 +1473,8 @@ parse_kycte (void *cls, .val = TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE }, { .name = "CLOSE", .val = TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE }, + { .name = "AGGREGATE", + .val = TALER_KYCLOGIC_KYC_TRIGGER_AGGREGATE }, { .name = NULL, .val = TALER_KYCLOGIC_KYC_TRIGGER_NONE }, }; diff --git a/src/kyclogic/kyclogic_api.c b/src/kyclogic/kyclogic_api.c index 1deac34ff..598cd50e9 100644 --- a/src/kyclogic/kyclogic_api.c +++ b/src/kyclogic/kyclogic_api.c @@ -1224,6 +1224,7 @@ TALER_KYCLOGIC_kyc_trigger_from_string ( { "MERGE", TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE }, { "BALANCE", TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE }, { "CLOSE", TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE }, + { "AGGREGATE", TALER_KYCLOGIC_KYC_TRIGGER_AGGREGATE }, { NULL, 0 } }; @@ -1260,6 +1261,8 @@ TALER_KYCLOGIC_kyc_trigger2s ( return "BALANCE"; case TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE: return "CLOSE"; + case TALER_KYCLOGIC_KYC_TRIGGER_AGGREGATE: + return "AGGREGATE"; } GNUNET_break (0); return NULL; diff --git a/src/testing/test_kyc_api.conf b/src/testing/test_kyc_api.conf index 34e12925a..4fff0dc69 100644 --- a/src/testing/test_kyc_api.conf +++ b/src/testing/test_kyc_api.conf @@ -30,8 +30,8 @@ ENABLED = YES EXPOSED = YES # All checks listed must be done (well, there is only one...) IS_AND_COMBINATOR = YES -# This happens if we deposit digital cash. -OPERATION_TYPE = DEPOSIT +# This happens if we aggregate digital cash for a wire transfer to a merchant. +OPERATION_TYPE = AGGREGATE # Threshold is 0, so any amount. THRESHOLD = EUR:0 # Timeframe doesn't exactly matter with a threshold of EUR:0. |