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/backenddb/test_merchantdb.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/backenddb/test_merchantdb.c')
| -rw-r--r-- | src/backenddb/test_merchantdb.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c index b471f805..58470786 100644 --- a/src/backenddb/test_merchantdb.c +++ b/src/backenddb/test_merchantdb.c @@ -117,15 +117,7 @@ make_instance (char *instance_id, GNUNET_assert (NULL != instance->instance.jurisdiction); GNUNET_assert (0 == json_array_append_new (instance->instance.jurisdiction, json_string ("Ohio"))); - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount ("EUR:1200.40", - &instance->instance. - default_max_deposit_fee)); - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount ("EUR:1200.40", - &instance->instance. - default_max_wire_fee)); - instance->instance.default_wire_fee_amortization = 1; + instance->instance.use_stefan = true; instance->instance.default_wire_transfer_delay = GNUNET_TIME_relative_get_minute_ (); instance->instance.default_pay_delay = GNUNET_TIME_relative_get_second_ (); @@ -235,15 +227,7 @@ check_instances_equal (const struct TALER_MERCHANTDB_InstanceSettings *a, b->address)) || (1 != json_equal (a->jurisdiction, b->jurisdiction)) || - (GNUNET_OK != TALER_amount_cmp_currency (&a->default_max_deposit_fee, - &b->default_max_deposit_fee)) || - (0 != TALER_amount_cmp (&a->default_max_deposit_fee, - &b->default_max_deposit_fee)) || - (GNUNET_OK != TALER_amount_cmp_currency (&a->default_max_wire_fee, - &b->default_max_wire_fee)) || - (0 != TALER_amount_cmp (&a->default_max_wire_fee, - &b->default_max_wire_fee)) || - (a->default_wire_fee_amortization != b->default_wire_fee_amortization) || + (a->use_stefan != b->use_stefan) || (a->default_wire_transfer_delay.rel_value_us != b->default_wire_transfer_delay.rel_value_us) || (a->default_pay_delay.rel_value_us != b->default_pay_delay.rel_value_us)) @@ -599,15 +583,7 @@ run_test_instances (struct TestInstances_Closure *cls) json_array_append_new (cls->instances[0].instance.jurisdiction, json_pack ("{s:s}", "vegetables", "bad")); - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount ("EUR:0.04", - &cls->instances[0].instance. - default_max_deposit_fee)); - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount ("EUR:1.23", - &cls->instances[0].instance. - default_max_wire_fee)); - cls->instances[0].instance.default_wire_fee_amortization = 2; + cls->instances[0].instance.use_stefan = false; cls->instances[0].instance.default_wire_transfer_delay = GNUNET_TIME_UNIT_HOURS; cls->instances[0].instance.default_pay_delay = GNUNET_TIME_UNIT_MINUTES; |