-fix FTBFS issues

This commit is contained in:
Christian Grothoff 2021-10-31 00:21:46 +02:00
parent 2faf102a05
commit 41bfdb4509
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 9 additions and 10 deletions

View File

@ -1711,7 +1711,7 @@ struct TALER_EXCHANGE_TransferData
/** /**
* hash of the payto:// URI the transfer went to * hash of the payto:// URI the transfer went to
*/ */
struct TALER_PaytoHash h_wire; struct TALER_PaytoHash h_payto;
/** /**
* time when the exchange claims to have performed the wire transfer * time when the exchange claims to have performed the wire transfer

View File

@ -218,8 +218,8 @@ track_transfer_cb (void *cls,
if (NULL != tts->wire_details_reference) if (NULL != tts->wire_details_reference)
{ {
const struct TALER_TESTING_Command *wire_details_cmd; const struct TALER_TESTING_Command *wire_details_cmd;
const json_t *wire_details; const char **payto_uri;
struct TALER_MerchantWireHash h_wire_details; struct TALER_PaytoHash h_payto;
wire_details_cmd wire_details_cmd
= TALER_TESTING_interpreter_lookup_command (is, = TALER_TESTING_interpreter_lookup_command (is,
@ -231,18 +231,17 @@ track_transfer_cb (void *cls,
return; return;
} }
if (GNUNET_OK != if (GNUNET_OK !=
TALER_TESTING_get_trait_wire_details (wire_details_cmd, TALER_TESTING_get_trait_payto_uri (wire_details_cmd,
&wire_details)) &payto_uri))
{ {
GNUNET_break (0); GNUNET_break (0);
TALER_TESTING_interpreter_fail (is); TALER_TESTING_interpreter_fail (is);
return; return;
} }
GNUNET_assert (GNUNET_OK == TALER_payto_hash (*payto_uri,
TALER_JSON_merchant_wire_signature_hash (wire_details, &h_payto);
&h_wire_details)); if (0 != GNUNET_memcmp (&h_payto,
if (0 != GNUNET_memcmp (&h_wire_details, &ta->h_payto))
&ta->h_wire))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Wire hash missmath to command %s\n", "Wire hash missmath to command %s\n",