diff options
Diffstat (limited to 'src/testing/testing_api_cmd_patch_instance.c')
| -rw-r--r-- | src/testing/testing_api_cmd_patch_instance.c | 118 |
1 files changed, 29 insertions, 89 deletions
diff --git a/src/testing/testing_api_cmd_patch_instance.c b/src/testing/testing_api_cmd_patch_instance.c index 348163af..cef38bec 100644 --- a/src/testing/testing_api_cmd_patch_instance.c +++ b/src/testing/testing_api_cmd_patch_instance.c @@ -55,16 +55,6 @@ struct PatchInstanceState const char *instance_id; /** - * Length of the @payto_uris array - */ - unsigned int payto_uris_length; - - /** - * Array of payto URIs. - */ - const char **payto_uris; - - /** * Name of the instance. */ const char *name; @@ -80,19 +70,9 @@ struct PatchInstanceState json_t *jurisdiction; /** - * Wire fee to use. - */ - struct TALER_Amount default_max_wire_fee; - - /** - * Amortization to use. - */ - uint32_t default_wire_fee_amortization; - - /** - * Deposit fee ceiling to use. + * Use STEFAN curve? */ - struct TALER_Amount default_max_deposit_fee; + bool use_stefan; /** * Wire transfer delay to use. @@ -173,21 +153,19 @@ patch_instance_run (void *cls, struct PatchInstanceState *pis = cls; pis->is = is; - pis->iph = TALER_MERCHANT_instance_patch (is->ctx, - pis->merchant_url, - pis->instance_id, - pis->payto_uris_length, - pis->payto_uris, - pis->name, - pis->address, - pis->jurisdiction, - &pis->default_max_wire_fee, - pis->default_wire_fee_amortization, - &pis->default_max_deposit_fee, - pis->default_wire_transfer_delay, - pis->default_pay_delay, - &patch_instance_cb, - pis); + pis->iph = TALER_MERCHANT_instance_patch ( + TALER_TESTING_interpreter_get_context (is), + pis->merchant_url, + pis->instance_id, + pis->name, + TALER_KYCLOGIC_KYC_UT_BUSINESS, + pis->address, + pis->jurisdiction, + pis->use_stefan, + pis->default_wire_transfer_delay, + pis->default_pay_delay, + &patch_instance_cb, + pis); GNUNET_assert (NULL != pis->iph); } @@ -202,44 +180,23 @@ patch_instance_run (void *cls, * @param index index number of the object to extract. * @return #GNUNET_OK on success */ -static int +static enum GNUNET_GenericReturnValue patch_instance_traits (void *cls, const void **ret, const char *trait, unsigned int index) { struct PatchInstanceState *pis = cls; - #define NUM_TRAITS (pis->payto_uris_length) + 11 - struct TALER_TESTING_Trait traits[NUM_TRAITS]; - traits[0] = - TALER_TESTING_make_trait_instance_name (&pis->name); - traits[1] = - TALER_TESTING_make_trait_instance_id (&pis->instance_id); - traits[2] = - TALER_TESTING_make_trait_address (pis->address); - traits[3] = - TALER_TESTING_make_trait_jurisdiction (pis->jurisdiction); - traits[4] = - TALER_TESTING_make_trait_max_wire_fee (&pis->default_max_wire_fee); - 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] = - TALER_TESTING_make_trait_pay_delay (&pis->default_pay_delay); - traits[9] = - TALER_TESTING_make_trait_payto_length (&pis->payto_uris_length); - traits[NUM_TRAITS - 1] = - TALER_TESTING_trait_end (); - for (unsigned int i = 0; i < pis->payto_uris_length; ++i) - { - traits[10 + i] = - TALER_TESTING_make_trait_payto_uris (i, - &pis->payto_uris[i]); - } + struct TALER_TESTING_Trait traits[] = { + TALER_TESTING_make_trait_instance_name (pis->name), + TALER_TESTING_make_trait_instance_id (pis->instance_id), + TALER_TESTING_make_trait_address (pis->address), + TALER_TESTING_make_trait_jurisdiction (pis->jurisdiction), + TALER_TESTING_make_trait_use_stefan (&pis->use_stefan), + TALER_TESTING_make_trait_wire_delay (&pis->default_wire_transfer_delay), + TALER_TESTING_make_trait_pay_delay (&pis->default_pay_delay), + TALER_TESTING_trait_end () + }; return TALER_TESTING_get_trait (traits, ret, @@ -267,9 +224,8 @@ patch_instance_cleanup (void *cls, "PATCH /instance/$ID operation did not complete\n"); TALER_MERCHANT_instance_patch_cancel (pis->iph); } - json_decref (pis->address); json_decref (pis->jurisdiction); - GNUNET_free (pis->payto_uris); + json_decref (pis->address); GNUNET_free (pis); } @@ -279,14 +235,10 @@ TALER_TESTING_cmd_merchant_patch_instance ( const char *label, const char *merchant_url, const char *instance_id, - unsigned int payto_uris_length, - const char *payto_uris[], 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) @@ -297,22 +249,10 @@ TALER_TESTING_cmd_merchant_patch_instance ( pis->merchant_url = merchant_url; pis->instance_id = instance_id; pis->http_status = http_status; - pis->payto_uris_length = payto_uris_length; - pis->payto_uris = GNUNET_new_array (payto_uris_length, - const char *); - memcpy (pis->payto_uris, - payto_uris, - sizeof (const char *) * payto_uris_length); 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; { |