commit 6ed4119af38b5f9139358b22fc5e26e58a67a325
parent 50a973ed63c6de2149f9da96c444047fc80f85b2
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 24 Jun 2024 12:48:38 +0200
-fix FTBFS
Diffstat:
4 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/src/auditor/taler-helper-auditor-wire.c b/src/auditor/taler-helper-auditor-wire.c
@@ -868,20 +868,15 @@ struct ReasonDetail
char *payto_uri;
/**
- * Reasons due to pending KYC requests.
+ * Account properties, possibly NULL.
*/
- char *kyc_pending;
+ json_t *properties;
/**
- * AML decision state for the target account.
+ * Account KYC rules.
*/
- enum TALER_AmlDecisionState status;
+ json_t *jrules;
- /**
- * Current AML threshold for the account, may be an invalid account if the
- * default threshold applies.
- */
- struct TALER_Amount aml_limit;
};
/**
@@ -935,7 +930,8 @@ free_report_entry (void *cls,
{
struct ReasonDetail *rd = value;
- GNUNET_free (rd->kyc_pending);
+ json_decref (rd->properties);
+ json_decref (rd->jrules);
GNUNET_free (rd->payto_uri);
GNUNET_free (rd);
return GNUNET_YES;
@@ -971,13 +967,14 @@ generate_report (void *cls,
return free_report_entry (cls,
key,
value); /* acceptable, amount was tiny */
+
+#if FIXME
// TODO: maybe split total_amount_lag up by category below?
TALER_ARL_amount_add (&total_amount_lag,
&total_amount_lag,
&rd->total_amount);
if (NULL != rd->kyc_pending)
{
-#if FIXME_CG
json_t *rep;
rep = GNUNET_JSON_PACK (
@@ -985,8 +982,11 @@ generate_report (void *cls,
&rd->total_amount),
TALER_JSON_pack_time_abs_human ("deadline",
rd->deadline.abs_time),
- GNUNET_JSON_pack_string ("kyc_pending",
- rd->kyc_pending),
+ GNUNET_JSON_pack_object_incref ("kyc_rules",
+ rd->rules),
+ GNUNET_JSON_pack_allow_null (
+ GNUNET_JSON_pack_object_incref ("properties",
+ rd->properties)),
GNUNET_JSON_pack_allow_null (
GNUNET_JSON_pack_string ("account",
rd->payto_uri)));
@@ -1006,11 +1006,9 @@ generate_report (void *cls,
TALER_ARL_report (report_kyc_lags,
rep);
-#endif
}
else if (TALER_AML_NORMAL != rd->status)
{
-#if FIXME_CG
const char *sstatus = "<undefined>";
json_t *rep;
@@ -1056,11 +1054,9 @@ generate_report (void *cls,
}*/
TALER_ARL_report (report_aml_lags,
rep);
-#endif
}
else
{
-#if FIXME
json_t *rep;
rep = GNUNET_JSON_PACK (
@@ -1086,8 +1082,8 @@ generate_report (void *cls,
}*/
TALER_ARL_report (report_lags,
rep);
-#endif
}
+#endif
return free_report_entry (cls,
key,
@@ -1130,9 +1126,8 @@ report_wire_missing_cb (void *cls,
TALER_ARL_edb->cls,
wire_target_h_payto,
&rd->payto_uri,
- &rd->kyc_pending,
- &rd->status,
- &rd->aml_limit);
+ &rd->properties,
+ &rd->jrules);
rd->total_amount = *total_amount;
rd->deadline = deadline;
}
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
@@ -5655,7 +5655,6 @@ struct TALER_EXCHANGEDB_Plugin
void *cb_cls);
-#if 0
/**
* Return any applicable justification as to why a wire transfer might have
* been held. Used by the auditor to determine if a wire transfer is
@@ -5664,9 +5663,8 @@ struct TALER_EXCHANGEDB_Plugin
* @param cls closure
* @param wire_target_h_payto effected target account
* @param[out] payto_uri target account URI, set to NULL if unknown
- * @param[out] kyc_pending set to string describing missing KYC data
- * @param[out] status set to AML status
- * @param[out] aml_limit set to AML limit, or invalid amount for none
+ * @param[out] jproperties account properties
+ * @param[out] jrules applicable KYC rules
* @return transaction status code
*/
enum GNUNET_DB_QueryStatus
@@ -5674,10 +5672,9 @@ struct TALER_EXCHANGEDB_Plugin
void *cls,
const struct TALER_PaytoHashP *wire_target_h_payto,
char **payto_uri,
- char **kyc_pending,
- enum TALER_AmlDecisionState *status,
- struct TALER_Amount *aml_limit);
-#endif
+ json_t **jproperties,
+ json_t **jrules);
+
/**
* Check the last date an auditor was modified.
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
@@ -99,7 +99,7 @@
TALER_TESTING_interpreter_fail (is); \
} while (0)
-l
+
/**
* Log an error message about a command not having
* run to completion.
@@ -288,9 +288,9 @@ struct TALER_TESTING_Command
* @param is interpreter state
*/
void
- (*run)(void *cls,
- const struct TALER_TESTING_Command *cmd,
- struct TALER_TESTING_Interpreter *is);
+ (*run)(void *cls,
+ const struct TALER_TESTING_Command *cmd,
+ struct TALER_TESTING_Interpreter *is);
/**
@@ -301,8 +301,8 @@ struct TALER_TESTING_Command
* @param cmd command being cleaned up
*/
void
- (*cleanup)(void *cls,
- const struct TALER_TESTING_Command *cmd);
+ (*cleanup)(void *cls,
+ const struct TALER_TESTING_Command *cmd);
/**
* Extract information from a command that is useful for other
diff --git a/src/lib/exchange_api_get_kyc_statistics.c b/src/lib/exchange_api_get_kyc_statistics.c
@@ -300,7 +300,7 @@ TALER_EXCHANGE_get_kyc_statistics (
void
-TALER_EXCHANGE_get_kyc_statistics_cancel (
+TALER_EXCHANGE_kyc_get_statistics_cancel (
struct TALER_EXCHANGE_KycGetStatisticsHandle *lh)
{
if (NULL != lh->job)
