[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 47/152: return fee as well
From: |
gnunet |
Subject: |
[taler-exchange] 47/152: return fee as well |
Date: |
Sun, 05 Jul 2020 20:46:43 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 5a4547388bae6713e8786e1c527e7eec5ee0abb3
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 6f91389f..62f49598 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -177,9 +177,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] 37/152: make tests skip until we have a wallet to regen the DB, (continued)
- [taler-exchange] 37/152: make tests skip until we have a wallet to regen the DB, gnunet, 2020/07/05
- [taler-exchange] 38/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] 39/152: modify TALER_EXCHANGE_deposits_get() API to combine returned arguments into a struct (simplifies merchant later), gnunet, 2020/07/05
- [taler-exchange] 26/152: towards changing timestamp in deposit confirmation (tests failing), gnunet, 2020/07/05
- [taler-exchange] 29/152: merge, gnunet, 2020/07/05
- [taler-exchange] 30/152: use unregister, gnunet, 2020/07/05
- [taler-exchange] 32/152: v8 bump, gnunet, 2020/07/05
- [taler-exchange] 46/152: modify TALER_EXCHANGE_deposits_get() API to avoid NULL pointers and need for deep copies, gnunet, 2020/07/05
- [taler-exchange] 42/152: return fee as well, gnunet, 2020/07/05
- [taler-exchange] 44/152: sleep to ensure aggregator has work, gnunet, 2020/07/05
- [taler-exchange] 47/152: return fee as well,
gnunet <=
- [taler-exchange] 48/152: update, gnunet, 2020/07/05
- [taler-exchange] 43/152: towards changing timestamp in deposit confirmation (tests failing), gnunet, 2020/07/05
- [taler-exchange] 52/152: fix drop call, gnunet, 2020/07/05
- [taler-exchange] 51/152: merge, gnunet, 2020/07/05
- [taler-exchange] 54/152: ecs, gnunet, 2020/07/05
- [taler-exchange] 56/152: update ECs, gnunet, 2020/07/05
- [taler-exchange] 61/152: bringing gana up to date so uncrustify accepts taler_error_codes.h, gnunet, 2020/07/05
- [taler-exchange] 59/152: fixed endianness in taler_sq_lib, gnunet, 2020/07/05
- [taler-exchange] 57/152: created taler_sq_lib, gnunet, 2020/07/05
- [taler-exchange] 62/152: do init submodules, gnunet, 2020/07/05