[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 52/130: -fix FTBFS issues
From: |
gnunet |
Subject: |
[taler-exchange] 52/130: -fix FTBFS issues |
Date: |
Wed, 17 Nov 2021 12:25:00 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 41bfdb450969f427005e8c4ac8948f3cf2e51e1d
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Oct 31 00:21:46 2021 +0200
-fix FTBFS issues
---
src/include/taler_exchange_service.h | 2 +-
src/testing/testing_api_cmd_transfer_get.c | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/include/taler_exchange_service.h
b/src/include/taler_exchange_service.h
index 36a23598..6daa120d 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1711,7 +1711,7 @@ struct TALER_EXCHANGE_TransferData
/**
* 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
diff --git a/src/testing/testing_api_cmd_transfer_get.c
b/src/testing/testing_api_cmd_transfer_get.c
index 10a9d826..580f6ee8 100644
--- a/src/testing/testing_api_cmd_transfer_get.c
+++ b/src/testing/testing_api_cmd_transfer_get.c
@@ -218,8 +218,8 @@ track_transfer_cb (void *cls,
if (NULL != tts->wire_details_reference)
{
const struct TALER_TESTING_Command *wire_details_cmd;
- const json_t *wire_details;
- struct TALER_MerchantWireHash h_wire_details;
+ const char **payto_uri;
+ struct TALER_PaytoHash h_payto;
wire_details_cmd
= TALER_TESTING_interpreter_lookup_command (is,
@@ -231,18 +231,17 @@ track_transfer_cb (void *cls,
return;
}
if (GNUNET_OK !=
- TALER_TESTING_get_trait_wire_details (wire_details_cmd,
- &wire_details))
+ TALER_TESTING_get_trait_payto_uri (wire_details_cmd,
+ &payto_uri))
{
GNUNET_break (0);
TALER_TESTING_interpreter_fail (is);
return;
}
- GNUNET_assert (GNUNET_OK ==
- TALER_JSON_merchant_wire_signature_hash (wire_details,
-
&h_wire_details));
- if (0 != GNUNET_memcmp (&h_wire_details,
- &ta->h_wire))
+ TALER_payto_hash (*payto_uri,
+ &h_payto);
+ if (0 != GNUNET_memcmp (&h_payto,
+ &ta->h_payto))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Wire hash missmath to command %s\n",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 38/130: fix FTBFS of exchangedb, (continued)
- [taler-exchange] 38/130: fix FTBFS of exchangedb, gnunet, 2021/11/17
- [taler-exchange] 26/130: fix auditor FTBFS, gnunet, 2021/11/17
- [taler-exchange] 53/130: fix test FTBFS, gnunet, 2021/11/17
- [taler-exchange] 46/130: sql fixes, gnunet, 2021/11/17
- [taler-exchange] 17/130: -fix more FTBFS issues, gnunet, 2021/11/17
- [taler-exchange] 24/130: -fix exchange FTBFS, gnunet, 2021/11/17
- [taler-exchange] 37/130: -fix test warnings, gnunet, 2021/11/17
- [taler-exchange] 40/130: -fix testing FTBFS, gnunet, 2021/11/17
- [taler-exchange] 15/130: -fix aggregator ftbfs, gnunet, 2021/11/17
- [taler-exchange] 23/130: -work on FTBFS, gnunet, 2021/11/17
- [taler-exchange] 52/130: -fix FTBFS issues,
gnunet <=
- [taler-exchange] 42/130: add another amount trait, gnunet, 2021/11/17
- [taler-exchange] 28/130: rename fest, gnunet, 2021/11/17
- [taler-exchange] 45/130: fix SQL, gnunet, 2021/11/17
- [taler-exchange] 48/130: fix more FTBFS issues, gnunet, 2021/11/17
- [taler-exchange] 56/130: SQL fixes, gnunet, 2021/11/17
- [taler-exchange] 27/130: eliminate HKDF when hashing paytos, gnunet, 2021/11/17
- [taler-exchange] 61/130: -fix, gnunet, 2021/11/17
- [taler-exchange] 16/130: -fix more FTBFS issues, gnunet, 2021/11/17
- [taler-exchange] 18/130: -fix misc FTBFS, gnunet, 2021/11/17
- [taler-exchange] 126/130: -bump version, gnunet, 2021/11/17