diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-04-17 14:01:55 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-04-17 14:01:55 +0200 |
| commit | 164c125528e4af078815c0156df54fa0120eed8a (patch) | |
| tree | 9d0a82d7a678059850f260b1f5fda79db3f57c32 /src/exchange-lib | |
| parent | 5a321621f40d09b4f38bdd6dd43ee6580915fba2 (diff) | |
| download | exchange-164c125528e4af078815c0156df54fa0120eed8a.tar.gz exchange-164c125528e4af078815c0156df54fa0120eed8a.tar.bz2 exchange-164c125528e4af078815c0156df54fa0120eed8a.zip | |
introducing closing fee
Diffstat (limited to 'src/exchange-lib')
| -rw-r--r-- | src/exchange-lib/exchange_api_wire.c | 4 | ||||
| -rw-r--r-- | src/exchange-lib/test_exchange_api.conf | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/exchange-lib/exchange_api_wire.c b/src/exchange-lib/exchange_api_wire.c index bdf4dc878..f1056fdd2 100644 --- a/src/exchange-lib/exchange_api_wire.c +++ b/src/exchange-lib/exchange_api_wire.c @@ -332,6 +332,8 @@ parse_json_fees (struct TALER_EXCHANGE_WireAggregateFees *af, &af->master_sig), TALER_JSON_spec_amount ("wire_fee", &af->wire_fee), + TALER_JSON_spec_amount ("closing_fee", + &af->closing_fee), GNUNET_JSON_spec_absolute_time ("start_date", &af->start_date), GNUNET_JSON_spec_absolute_time ("end_date", @@ -376,6 +378,8 @@ check_sig (const struct TALER_EXCHANGE_WireAggregateFees *af, wp.end_date = GNUNET_TIME_absolute_hton (af->end_date); TALER_amount_hton (&wp.wire_fee, &af->wire_fee); + TALER_amount_hton (&wp.closing_fee, + &af->closing_fee); return GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MASTER_WIRE_FEES, &wp.purpose, &af->master_sig.eddsa_signature, diff --git a/src/exchange-lib/test_exchange_api.conf b/src/exchange-lib/test_exchange_api.conf index 42861eae1..19119b7d9 100644 --- a/src/exchange-lib/test_exchange_api.conf +++ b/src/exchange-lib/test_exchange_api.conf @@ -43,6 +43,17 @@ WIRE-FEE-2024 = EUR:0.01 WIRE-FEE-2025 = EUR:0.01 WIRE-FEE-2026 = EUR:0.01 +CLOSING-FEE-2017 = EUR:0.01 +CLOSING-FEE-2018 = EUR:0.01 +CLOSING-FEE-2019 = EUR:0.01 +CLOSING-FEE-2020 = EUR:0.01 +CLOSING-FEE-2021 = EUR:0.01 +CLOSING-FEE-2022 = EUR:0.01 +CLOSING-FEE-2023 = EUR:0.01 +CLOSING-FEE-2024 = EUR:0.01 +CLOSING-FEE-2025 = EUR:0.01 +CLOSING-FEE-2026 = EUR:0.01 + [exchange-wire-incoming-sepa] # This is the response we give out for the /wire request. It provides # wallets with the bank information for transfers to the exchange. @@ -65,6 +76,16 @@ WIRE-FEE-2024 = EUR:0.01 WIRE-FEE-2025 = EUR:0.01 WIRE-FEE-2026 = EUR:0.01 +CLOSING-FEE-2017 = EUR:0.01 +CLOSING-FEE-2018 = EUR:0.01 +CLOSING-FEE-2019 = EUR:0.01 +CLOSING-FEE-2020 = EUR:0.01 +CLOSING-FEE-2021 = EUR:0.01 +CLOSING-FEE-2022 = EUR:0.01 +CLOSING-FEE-2023 = EUR:0.01 +CLOSING-FEE-2024 = EUR:0.01 +CLOSING-FEE-2025 = EUR:0.01 +CLOSING-FEE-2026 = EUR:0.01 [exchange-wire-incoming-test] # This is the response we give out for the /wire request. It provides |