diff options
| author | Christian Grothoff <christian@grothoff.org> | 2023-08-22 23:15:08 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2023-08-22 23:15:08 +0200 |
| commit | c98d960d1badd1eeb834bacbc133960e2f86d304 (patch) | |
| tree | fc94b246475ff387cf5aa4d8bbc3f0aa2f4b7d65 /src/backend/taler-merchant-httpd_private-post-instances.c | |
| parent | 525426db10c179fcacd19487f6c22cac837b2d40 (diff) | |
| download | merchant-c98d960d1badd1eeb834bacbc133960e2f86d304.tar.gz merchant-c98d960d1badd1eeb834bacbc133960e2f86d304.tar.bz2 merchant-c98d960d1badd1eeb834bacbc133960e2f86d304.zip | |
add currency to amounts in merchant DB
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-post-instances.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-instances.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/backend/taler-merchant-httpd_private-post-instances.c b/src/backend/taler-merchant-httpd_private-post-instances.c index 236741a1..6c9727e9 100644 --- a/src/backend/taler-merchant-httpd_private-post-instances.c +++ b/src/backend/taler-merchant-httpd_private-post-instances.c @@ -136,14 +136,8 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, &is.address), GNUNET_JSON_spec_json ("jurisdiction", &is.jurisdiction), - TALER_JSON_spec_amount ("default_max_wire_fee", - TMH_currency, - &is.default_max_wire_fee), - GNUNET_JSON_spec_uint32 ("default_wire_fee_amortization", - &is.default_wire_fee_amortization), - TALER_JSON_spec_amount ("default_max_deposit_fee", - TMH_currency, - &is.default_max_deposit_fee), + GNUNET_JSON_spec_bool ("use_stefan", + &is.use_stefan), GNUNET_JSON_spec_relative_time ("default_wire_transfer_delay", &is.default_wire_transfer_delay), GNUNET_JSON_spec_relative_time ("default_pay_delay", @@ -292,20 +286,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler *rh, is.address)) && (1 == json_equal (mi->settings.jurisdiction, is.jurisdiction)) && - (GNUNET_OK == - TALER_amount_cmp_currency ( - &mi->settings.default_max_deposit_fee, - &is.default_max_deposit_fee)) && - (0 == TALER_amount_cmp (&mi->settings.default_max_deposit_fee, - &is.default_max_deposit_fee)) && - (GNUNET_OK == - TALER_amount_cmp_currency ( - &mi->settings.default_max_wire_fee, - &is.default_max_wire_fee)) && - (0 == TALER_amount_cmp (&mi->settings.default_max_wire_fee, - &is.default_max_wire_fee)) && - (mi->settings.default_wire_fee_amortization == - is.default_wire_fee_amortization) && + (mi->settings.use_stefan == is.use_stefan) && (GNUNET_TIME_relative_cmp (mi->settings.default_wire_transfer_delay, ==, is.default_wire_transfer_delay)) && |