-also work with h_payto trait

This commit is contained in:
Christian Grothoff 2022-03-10 01:48:46 +01:00
parent e1e68cebb8
commit 9a3d993d07
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 20 additions and 8 deletions

View File

@ -2445,6 +2445,7 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
#define TALER_TESTING_SIMPLE_TRAITS(op) \ #define TALER_TESTING_SIMPLE_TRAITS(op) \
op (bank_row, const uint64_t) \ op (bank_row, const uint64_t) \
op (reserve_priv, const struct TALER_ReservePrivateKeyP) \ op (reserve_priv, const struct TALER_ReservePrivateKeyP) \
op (h_payto, const struct TALER_PaytoHashP) \
op (planchet_secret, const struct TALER_PlanchetMasterSecretP) \ op (planchet_secret, const struct TALER_PlanchetMasterSecretP) \
op (refresh_secret, const struct TALER_RefreshMasterSecretP) \ op (refresh_secret, const struct TALER_RefreshMasterSecretP) \
op (reserve_pub, const struct TALER_ReservePublicKeyP) \ op (reserve_pub, const struct TALER_ReservePublicKeyP) \

View File

@ -148,16 +148,27 @@ proof_kyc_run (void *cls,
if (GNUNET_OK != if (GNUNET_OK !=
TALER_TESTING_get_trait_payto_uri (res_cmd, TALER_TESTING_get_trait_payto_uri (res_cmd,
&payto_uri)) &payto_uri))
{
const struct TALER_PaytoHashP *hpt;
if (GNUNET_OK !=
TALER_TESTING_get_trait_h_payto (res_cmd,
&hpt))
{ {
GNUNET_break (0); GNUNET_break (0);
TALER_TESTING_interpreter_fail (kps->is); TALER_TESTING_interpreter_fail (kps->is);
return; return;
} }
h_payto = *hpt;
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Triggering KYC proof for %s\n", "Triggering KYC proof for %s\n",
*payto_uri); *payto_uri);
TALER_payto_hash (*payto_uri, TALER_payto_hash (*payto_uri,
&h_payto); &h_payto);
}
kps->kph = TALER_EXCHANGE_kyc_proof (is->exchange, kps->kph = TALER_EXCHANGE_kyc_proof (is->exchange,
&h_payto, &h_payto,
kps->code, kps->code,