[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 115/152: return fee as well
From: |
gnunet |
Subject: |
[taler-exchange] 115/152: return fee as well |
Date: |
Sun, 05 Jul 2020 20:47:51 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 15daa781271387bb0799b59f9da51563b24fa723
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue May 5 22:17:16 2020 +0200
return fee as well
---
src/lib/exchange_api_refund.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 1af1f14b..687dbdae 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -178,9 +178,13 @@ handle_refund_finished (void *cls,
{
ep = &exchange_pub;
es = &exchange_sig;
+<<<<<<< HEAD
TALER_amount_ntoh (&ra,
&rh->depconf.refund_fee);
rf = &ra;
+=======
+ rf = &rh->depconf.refund_fee;
+>>>>>>> return fee as well
}
break;
case MHD_HTTP_BAD_REQUEST:
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 89/152: ign, (continued)
- [taler-exchange] 89/152: ign, gnunet, 2020/07/05
- [taler-exchange] 94/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later), gnunet, 2020/07/05
- [taler-exchange] 99/152: sleep to ensure aggregator has work, gnunet, 2020/07/05
- [taler-exchange] 96/152: combine sections, gnunet, 2020/07/05
- [taler-exchange] 88/152: fix status code, gnunet, 2020/07/05
- [taler-exchange] 102/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later), gnunet, 2020/07/05
- [taler-exchange] 107/152: fix status code, gnunet, 2020/07/05
- [taler-exchange] 104/152: update, gnunet, 2020/07/05
- [taler-exchange] 114/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies, gnunet, 2020/07/05
- [taler-exchange] 118/152: fix auditor drop, gnunet, 2020/07/05
- [taler-exchange] 115/152: return fee as well,
gnunet <=
- [taler-exchange] 123/152: implemented the other functions for taler_sq_lib, gnunet, 2020/07/05
- [taler-exchange] 126/152: bringing gana up to date so uncrustify accepts taler_error_codes.h, gnunet, 2020/07/05
- [taler-exchange] 128/152: update gana, gnunet, 2020/07/05
- [taler-exchange] 131/152: moved yna to exchange, gnunet, 2020/07/05
- [taler-exchange] 140/152: synchronize with latest GANA, gnunet, 2020/07/05
- [taler-exchange] 146/152: expand justifications / agree with append-only log, gnunet, 2020/07/05
- [taler-exchange] 109/152: update exchange API to return struct instead of lots of individual args for TALER_EXCHANGE_transfers_get() -- simplifies merchant later, gnunet, 2020/07/05
- [taler-exchange] 119/152: ecs, gnunet, 2020/07/05
- [taler-exchange] 111/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies, gnunet, 2020/07/05
- [taler-exchange] 127/152: do init submodules, gnunet, 2020/07/05