diff options
Diffstat (limited to 'src/testing')
| -rw-r--r-- | src/testing/test_auditor_api.c | 1 | ||||
| -rw-r--r-- | src/testing/test_exchange_api.c | 5 | ||||
| -rw-r--r-- | src/testing/test_exchange_api_twisted.c | 10 | ||||
| -rw-r--r-- | src/testing/testing_api_cmd_refund.c | 26 | 
4 files changed, 0 insertions, 42 deletions
| diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c index 7b699626..0ff28b29 100644 --- a/src/testing/test_auditor_api.c +++ b/src/testing/test_auditor_api.c @@ -353,7 +353,6 @@ run (void *cls,      TALER_TESTING_cmd_refund ("refund-ok",                                MHD_HTTP_OK,                                "EUR:5", -                              "EUR:0.01",                                "deposit-refund-1"),      /**       * Spend 4.99 EUR of the refunded 4.99 EUR coin (1ct gone diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c index 0c3f4837..a2bf9001 100644 --- a/src/testing/test_exchange_api.c +++ b/src/testing/test_exchange_api.c @@ -528,18 +528,15 @@ run (void *cls,      TALER_TESTING_cmd_refund ("refund-ok",                                MHD_HTTP_OK,                                "EUR:5", -                              "EUR:0.01",                                "deposit-refund-1"),      TALER_TESTING_cmd_refund ("refund-ok-double",                                MHD_HTTP_OK,                                "EUR:5", -                              "EUR:0.01",                                "deposit-refund-1"),      /* Previous /refund(s) had id == 0.  */      TALER_TESTING_cmd_refund_with_id ("refund-conflicting",                                        MHD_HTTP_CONFLICT,                                        "EUR:5", -                                      "EUR:0.01",                                        "deposit-refund-1",                                        1),      /** @@ -573,7 +570,6 @@ run (void *cls,      TALER_TESTING_cmd_refund ("refund-fail",                                MHD_HTTP_GONE,                                "EUR:4.99", -                              "EUR:0.01",                                "deposit-refund-2"),      TALER_TESTING_cmd_check_bank_empty ("check-empty-after-refund"),      /** @@ -607,7 +603,6 @@ run (void *cls,      TALER_TESTING_cmd_refund ("refund-ok-fast",                                MHD_HTTP_OK,                                "EUR:5", -                              "EUR:0.01",                                "deposit-refund-1b"),      /**       * Run transfers. This will do the transfer as refund deadline diff --git a/src/testing/test_exchange_api_twisted.c b/src/testing/test_exchange_api_twisted.c index 9aac3d1e..05337219 100644 --- a/src/testing/test_exchange_api_twisted.c +++ b/src/testing/test_exchange_api_twisted.c @@ -173,12 +173,6 @@ run (void *cls,      TALER_TESTING_cmd_refund ("refund-currency-mismatch",                                MHD_HTTP_BAD_REQUEST,                                "USD:5", -                              "USD:0.01", -                              "deposit-refund-1"), -    TALER_TESTING_cmd_refund ("refund-fee-above-amount", -                              MHD_HTTP_BAD_REQUEST, -                              "EUR:5", -                              "EUR:10",                                "deposit-refund-1"),      TALER_TESTING_cmd_flip_upload ("flip-upload",                                     CONFIG_FILE, @@ -186,7 +180,6 @@ run (void *cls,      TALER_TESTING_cmd_refund ("refund-bad-sig",                                MHD_HTTP_FORBIDDEN,                                "EUR:5", -                              "EUR:0.01",                                "deposit-refund-1"),      /* This next deposit CMD is only used to provide a @@ -207,17 +200,14 @@ run (void *cls,      TALER_TESTING_cmd_refund ("refund-deposit-not-found",                                MHD_HTTP_NOT_FOUND,                                "EUR:5", -                              "EUR:0.01",                                "deposit-refund-to-fail"),      TALER_TESTING_cmd_refund ("refund-insufficient-funds",                                MHD_HTTP_PRECONDITION_FAILED,                                "EUR:50", -                              "EUR:0.01",                                "deposit-refund-1"),      TALER_TESTING_cmd_refund ("refund-fee-too-low",                                MHD_HTTP_BAD_REQUEST,                                "EUR:5", -                              "EUR:0.000001",                                "deposit-refund-1"),      TALER_TESTING_cmd_end ()    }; diff --git a/src/testing/testing_api_cmd_refund.c b/src/testing/testing_api_cmd_refund.c index 47f5a060..c27311fb 100644 --- a/src/testing/testing_api_cmd_refund.c +++ b/src/testing/testing_api_cmd_refund.c @@ -44,11 +44,6 @@ struct RefundState    const char *refund_amount;    /** -   * Expected refund fee. -   */ -  const char *refund_fee; - -  /**     * Reference to any command that can provide a coin to refund.     */    const char *coin_reference; @@ -133,7 +128,6 @@ refund_run (void *cls,    struct TALER_CoinSpendPublicKeyP coin;    const json_t *contract_terms;    struct GNUNET_HashCode h_contract_terms; -  struct TALER_Amount refund_fee;    struct TALER_Amount refund_amount;    const struct TALER_MerchantPrivateKeyP *merchant_priv;    const struct TALER_TESTING_Command *coin_cmd; @@ -153,19 +147,6 @@ refund_run (void *cls,      TALER_TESTING_interpreter_fail (is);      return;    } -  if (GNUNET_OK != -      TALER_string_to_amount (rs->refund_fee, -                              &refund_fee)) -  { -    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, -                "Failed to parse amount `%s' at %u/%s\n", -                rs->refund_fee, -                is->ip, -                cmd->label); -    TALER_TESTING_interpreter_fail (is); -    return; -  } -    coin_cmd = TALER_TESTING_interpreter_lookup_command (is,                                                         rs->coin_reference);    if (NULL == coin_cmd) @@ -211,7 +192,6 @@ refund_run (void *cls,    }    rs->rh = TALER_EXCHANGE_refund (rs->exchange,                                    &refund_amount, -                                  &refund_fee,                                    &h_contract_terms,                                    &coin,                                    rs->refund_transaction_id, @@ -254,7 +234,6 @@ refund_cleanup (void *cls,   * @param label command label.   * @param expected_response_code expected HTTP status code.   * @param refund_amount the amount to ask a refund for. - * @param refund_fee expected refund fee.   * @param coin_reference reference to a command that can   *        provide a coin to be refunded.   * @@ -264,7 +243,6 @@ struct TALER_TESTING_Command  TALER_TESTING_cmd_refund (const char *label,                            unsigned int expected_response_code,                            const char *refund_amount, -                          const char *refund_fee,                            const char *coin_reference)  {    struct RefundState *rs; @@ -273,7 +251,6 @@ TALER_TESTING_cmd_refund (const char *label,    rs->expected_response_code = expected_response_code;    rs->refund_amount = refund_amount; -  rs->refund_fee = refund_fee;    rs->coin_reference = coin_reference;    {      struct TALER_TESTING_Command cmd = { @@ -295,7 +272,6 @@ TALER_TESTING_cmd_refund (const char *label,   * @param label command label.   * @param expected_response_code expected HTTP status code.   * @param refund_amount the amount to ask a refund for. - * @param refund_fee expected refund fee.   * @param coin_reference reference to a command that can   *        provide a coin to be refunded.   * @param refund_transaction_id transaction id to use @@ -308,7 +284,6 @@ TALER_TESTING_cmd_refund_with_id    (const char *label,    unsigned int expected_response_code,    const char *refund_amount, -  const char *refund_fee,    const char *coin_reference,    uint64_t refund_transaction_id)  { @@ -317,7 +292,6 @@ TALER_TESTING_cmd_refund_with_id    rs = GNUNET_new (struct RefundState);    rs->expected_response_code = expected_response_code;    rs->refund_amount = refund_amount; -  rs->refund_fee = refund_fee;    rs->coin_reference = coin_reference;    rs->refund_transaction_id = refund_transaction_id;    { | 
