diff options
Diffstat (limited to 'src/testing/testing_api_cmd_patch_instance.c')
| -rw-r--r-- | src/testing/testing_api_cmd_patch_instance.c | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/src/testing/testing_api_cmd_patch_instance.c b/src/testing/testing_api_cmd_patch_instance.c index f069046a..59dcac07 100644 --- a/src/testing/testing_api_cmd_patch_instance.c +++ b/src/testing/testing_api_cmd_patch_instance.c @@ -80,19 +80,9 @@ struct PatchInstanceState json_t *jurisdiction; /** - * Wire fee to use. + * Use STEFAN curve? */ - struct TALER_Amount default_max_wire_fee; - - /** - * Amortization to use. - */ - uint32_t default_wire_fee_amortization; - - /** - * Deposit fee ceiling to use. - */ - struct TALER_Amount default_max_deposit_fee; + bool use_stefan; /** * Wire transfer delay to use. @@ -190,9 +180,7 @@ patch_instance_run (void *cls, TALER_KYCLOGIC_KYC_UT_BUSINESS, pis->address, pis->jurisdiction, - &pis->default_max_wire_fee, - pis->default_wire_fee_amortization, - &pis->default_max_deposit_fee, + pis->use_stefan, pis->default_wire_transfer_delay, pis->default_pay_delay, &patch_instance_cb, @@ -218,7 +206,7 @@ patch_instance_traits (void *cls, unsigned int index) { struct PatchInstanceState *pis = cls; - #define NUM_TRAITS (pis->payto_uris_length) + 11 + #define NUM_TRAITS (pis->payto_uris_length) + 9 struct TALER_TESTING_Trait traits[NUM_TRAITS]; traits[0] = TALER_TESTING_make_trait_instance_name (pis->name); @@ -229,17 +217,12 @@ patch_instance_traits (void *cls, traits[3] = TALER_TESTING_make_trait_jurisdiction (pis->jurisdiction); traits[4] = - TALER_TESTING_make_trait_max_wire_fee (&pis->default_max_wire_fee); + TALER_TESTING_make_trait_use_stefan (&pis->use_stefan); traits[5] = - TALER_TESTING_make_trait_wire_fee_amortization ( - &pis->default_wire_fee_amortization); - traits[6] = - TALER_TESTING_make_trait_max_deposit_fee (&pis->default_max_deposit_fee); - traits[7] = TALER_TESTING_make_trait_wire_delay (&pis->default_wire_transfer_delay); - traits[8] = + traits[6] = TALER_TESTING_make_trait_pay_delay (&pis->default_pay_delay); - traits[9] = + traits[7] = TALER_TESTING_make_trait_payto_length (&pis->payto_uris_length); traits[NUM_TRAITS - 1] = TALER_TESTING_trait_end (); @@ -293,9 +276,7 @@ TALER_TESTING_cmd_merchant_patch_instance ( const char *name, json_t *address, json_t *jurisdiction, - const char *default_max_wire_fee, - uint32_t default_wire_fee_amortization, - const char *default_max_deposit_fee, + bool use_stefan, struct GNUNET_TIME_Relative default_wire_transfer_delay, struct GNUNET_TIME_Relative default_pay_delay, unsigned int http_status) @@ -315,13 +296,7 @@ TALER_TESTING_cmd_merchant_patch_instance ( pis->name = name; pis->address = address; /* ownership transfer! */ pis->jurisdiction = jurisdiction; /* ownership transfer! */ - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount (default_max_wire_fee, - &pis->default_max_wire_fee)); - pis->default_wire_fee_amortization = default_wire_fee_amortization; - GNUNET_assert (GNUNET_OK == - TALER_string_to_amount (default_max_deposit_fee, - &pis->default_max_deposit_fee)); + pis->use_stefan = use_stefan; pis->default_wire_transfer_delay = default_wire_transfer_delay; pis->default_pay_delay = default_pay_delay; { |