[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 78/152: fix #6236
From: |
gnunet |
Subject: |
[taler-exchange] 78/152: fix #6236 |
Date: |
Sun, 05 Jul 2020 20:47:14 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit d0d71dab8177cdac8a6e8c4f8a846053d8b738a7
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Jun 27 18:30:25 2020 +0200
fix #6236
---
src/include/taler_testing_lib.h | 10 ++++++++++
src/testing/testing_api_cmd_deposit.c | 14 ++++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index bfb86be1..ae0bcce7 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1331,6 +1331,16 @@ TALER_TESTING_cmd_status (const char *label,
const char *expected_balance,
unsigned int expected_response_code);
+/**
+ * Index of the deposit value trait of a deposit command.
+ */
+#define TALER_TESTING_CMD_DEPOSIT_TRAIT_IDX_DEPOSIT_VALUE 0
+
+/**
+ * Index of the deposit fee trait of a deposit command.
+ */
+#define TALER_TESTING_CMD_DEPOSIT_TRAIT_IDX_DEPOSIT_FEE 1
+
/**
* Create a "deposit" command.
*
diff --git a/src/testing/testing_api_cmd_deposit.c
b/src/testing/testing_api_cmd_deposit.c
index 049f36f2..f302a218 100644
--- a/src/testing/testing_api_cmd_deposit.c
+++ b/src/testing/testing_api_cmd_deposit.c
@@ -52,6 +52,11 @@ struct DepositState
*/
struct TALER_Amount amount;
+ /**
+ * Deposit fee.
+ */
+ struct TALER_Amount deposit_fee;
+
/**
* Reference to any command that is able to provide a coin.
*/
@@ -374,6 +379,7 @@ deposit_run (void *cls,
TALER_TESTING_interpreter_fail (is);
return;
}
+ ds->deposit_fee = denom_pub->fee_deposit;
GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
&coin_pub.eddsa_pub);
@@ -541,8 +547,12 @@ deposit_traits (void *cls,
ds->contract_terms),
TALER_TESTING_make_trait_merchant_priv (0,
&ds->merchant_priv),
- TALER_TESTING_make_trait_amount_obj (0,
- &ds->amount),
+ TALER_TESTING_make_trait_amount_obj (
+ TALER_TESTING_CMD_DEPOSIT_TRAIT_IDX_DEPOSIT_VALUE,
+ &ds->amount),
+ TALER_TESTING_make_trait_amount_obj (
+ TALER_TESTING_CMD_DEPOSIT_TRAIT_IDX_DEPOSIT_FEE,
+ &ds->deposit_fee),
TALER_TESTING_make_trait_absolute_time (0,
&ds->exchange_timestamp),
TALER_TESTING_trait_end ()
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 56/152: update ECs, (continued)
- [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
- [taler-exchange] 68/152: synchronize with latest GANA, gnunet, 2020/07/05
- [taler-exchange] 66/152: moved yna to exchange, gnunet, 2020/07/05
- [taler-exchange] 69/152: TALER_TESTING_cmd_admin_add_incoming_with_ref finds reserve_pub if reserve_priv doesn't exist, gnunet, 2020/07/05
- [taler-exchange] 72/152: Merge branch 'protocolv8' of git+ssh://git.taler.net/exchange into protocolv8, gnunet, 2020/07/05
- [taler-exchange] 75/152: clarify with/without wire fee issue, sanity checks on currencies, gnunet, 2020/07/05
- [taler-exchange] 78/152: fix #6236,
gnunet <=
- [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