diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-04-20 01:50:26 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-04-20 01:50:26 +0200 |
| commit | f693e25793f9e8f75b80b11b066ed209e8aa4c1c (patch) | |
| tree | 07bd275d003080389d67ed142b7673bab469c40f /src/exchange | |
| parent | 1d8da4bf8442e4864e877a665c876d0cd5e03de8 (diff) | |
| download | exchange-f693e25793f9e8f75b80b11b066ed209e8aa4c1c.tar.gz exchange-f693e25793f9e8f75b80b11b066ed209e8aa4c1c.tar.bz2 exchange-f693e25793f9e8f75b80b11b066ed209e8aa4c1c.zip | |
introduce refund fee
Diffstat (limited to 'src/exchange')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_keystate.c | 9 | ||||
| -rw-r--r-- | src/exchange/test_taler_exchange_aggregator.c | 3 | ||||
| -rw-r--r-- | src/exchange/test_taler_exchange_httpd.conf | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c index c9db50895..e16d3a62e 100644 --- a/src/exchange/taler-exchange-httpd_keystate.c +++ b/src/exchange/taler-exchange-httpd_keystate.c @@ -133,6 +133,7 @@ denom_key_issue_to_json (const struct TALER_DenominationPublicKey *pk, struct TALER_Amount fee_withdraw; struct TALER_Amount fee_deposit; struct TALER_Amount fee_refresh; + struct TALER_Amount fee_refund; TALER_amount_ntoh (&value, &dki->properties.value); @@ -142,8 +143,10 @@ denom_key_issue_to_json (const struct TALER_DenominationPublicKey *pk, &dki->properties.fee_deposit); TALER_amount_ntoh (&fee_refresh, &dki->properties.fee_refresh); + TALER_amount_ntoh (&fee_refund, + &dki->properties.fee_refund); return - json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}", + json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}", "master_sig", GNUNET_JSON_from_data (&dki->signature, sizeof (struct GNUNET_CRYPTO_EddsaSignature)), @@ -164,7 +167,9 @@ denom_key_issue_to_json (const struct TALER_DenominationPublicKey *pk, "fee_deposit", TALER_JSON_from_amount (&fee_deposit), "fee_refresh", - TALER_JSON_from_amount (&fee_refresh)); + TALER_JSON_from_amount (&fee_refresh), + "fee_refund", + TALER_JSON_from_amount (&fee_refund)); } diff --git a/src/exchange/test_taler_exchange_aggregator.c b/src/exchange/test_taler_exchange_aggregator.c index 54d63a461..e4ca89c77 100644 --- a/src/exchange/test_taler_exchange_aggregator.c +++ b/src/exchange/test_taler_exchange_aggregator.c @@ -359,6 +359,9 @@ fake_issue (struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue) GNUNET_assert (GNUNET_OK == TALER_string_to_amount_nbo ("EUR:0.1", &issue->properties.fee_refresh)); + GNUNET_assert (GNUNET_OK == + TALER_string_to_amount_nbo ("EUR:0.1", + &issue->properties.fee_refund)); } diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf index 5b49c0824..612d9f4d4 100644 --- a/src/exchange/test_taler_exchange_httpd.conf +++ b/src/exchange/test_taler_exchange_httpd.conf @@ -50,6 +50,7 @@ duration_legal = 3 years fee_withdraw = EUR:0.00 fee_deposit = EUR:0.00 fee_refresh = EUR:0.01 +fee_refund = EUR:0.01 rsa_keysize = 1024 [coin_eur_ct_10] @@ -61,6 +62,7 @@ duration_legal = 3 years fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 +fee_refund = EUR:0.01 rsa_keysize = 1024 [coin_eur_1] @@ -72,4 +74,5 @@ duration_legal = 3 years fee_withdraw = EUR:0.01 fee_deposit = EUR:0.01 fee_refresh = EUR:0.03 +fee_refund = EUR:0.01 rsa_keysize = 1024 |