[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 45/152: modify TALER_EXCHANGE_deposits_get() API to com
From: |
gnunet |
Subject: |
[taler-exchange] 45/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later) |
Date: |
Sun, 05 Jul 2020 20:46:41 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 353c4e2fa0ad2797c69aea1a580b6dc1f6e66508
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun May 3 20:07:49 2020 +0200
modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into
a struct (simplifies merchant later)
---
src/testing/testing_api_cmd_deposits_get.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/testing/testing_api_cmd_deposits_get.c
b/src/testing/testing_api_cmd_deposits_get.c
index 33987e16..58456a49 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -111,7 +111,8 @@ deposit_wtid_cb (void *cls,
switch (hr->http_status)
{
case MHD_HTTP_OK:
- tts->wtid = dd->wtid;
+ GNUNET_assert (NULL != dd->wtid);
+ tts->wtid = *dd->wtid;
if (NULL != tts->bank_transfer_reference)
{
const struct TALER_TESTING_Command *bank_transfer_cmd;
@@ -139,7 +140,11 @@ deposit_wtid_cb (void *cls,
}
/* Compare that expected and gotten subjects match. */
+<<<<<<< HEAD
if (0 != GNUNET_memcmp (&dd->wtid,
+=======
+ if (0 != GNUNET_memcmp (dd->wtid,
+>>>>>>> modify TALER_EXCHANGE_deposits_get() API to combine returned arguments
into a struct (simplifies merchant later)
wtid_want))
{
GNUNET_break (0);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 74/152: traits for int64_t and json_t, (continued)
- [taler-exchange] 74/152: traits for int64_t and json_t, gnunet, 2020/07/05
- [taler-exchange] 50/152: more ecs, gnunet, 2020/07/05
- [taler-exchange] 49/152: use unregister, gnunet, 2020/07/05
- [taler-exchange] 53/152: fix auditor drop, gnunet, 2020/07/05
- [taler-exchange] 55/152: more ECs, gnunet, 2020/07/05
- [taler-exchange] 58/152: implemented the other functions for taler_sq_lib, gnunet, 2020/07/05
- [taler-exchange] 60/152: taler_error_codes.h auto generated from gnunet/gana.git as a submodule, gnunet, 2020/07/05
- [taler-exchange] 31/152: more ecs, gnunet, 2020/07/05
- [taler-exchange] 34/152: ign, gnunet, 2020/07/05
- [taler-exchange] 41/152: combine sections, gnunet, 2020/07/05
- [taler-exchange] 45/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later),
gnunet <=
- [taler-exchange] 33/152: fix status code, gnunet, 2020/07/05
- [taler-exchange] 36/152: void basedb due to signature format change, gnunet, 2020/07/05
- [taler-exchange] 63/152: update gana, gnunet, 2020/07/05
- [taler-exchange] 67/152: add TALER_yna_to_string(), gnunet, 2020/07/05
- [taler-exchange] 65/152: sync gana, gnunet, 2020/07/05
- [taler-exchange] 70/152: synchronize with latest GANA, gnunet, 2020/07/05
- [taler-exchange] 71/152: add TALER_MHD_parse_internal_json_data(), gnunet, 2020/07/05
- [taler-exchange] 73/152: testing traits for uint32_t and GNUNET_TIME_Relative, gnunet, 2020/07/05
- [taler-exchange] 76/152: Merge branch 'protocolv8' of git+ssh://git.taler.net/exchange into protocolv8, gnunet, 2020/07/05
- [taler-exchange] 79/152: fix FIXME by exposing deposit permission signing in API instead of doing it inside of the testing logic, gnunet, 2020/07/05