diff options
Diffstat (limited to 'src/testing/testing_api_cmd_refund.c')
-rw-r--r-- | src/testing/testing_api_cmd_refund.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/testing/testing_api_cmd_refund.c b/src/testing/testing_api_cmd_refund.c index 47f5a0609..c27311fbf 100644 --- a/src/testing/testing_api_cmd_refund.c +++ b/src/testing/testing_api_cmd_refund.c | |||
@@ -44,11 +44,6 @@ struct RefundState | |||
44 | const char *refund_amount; | 44 | const char *refund_amount; |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * Expected refund fee. | ||
48 | */ | ||
49 | const char *refund_fee; | ||
50 | |||
51 | /** | ||
52 | * Reference to any command that can provide a coin to refund. | 47 | * Reference to any command that can provide a coin to refund. |
53 | */ | 48 | */ |
54 | const char *coin_reference; | 49 | const char *coin_reference; |
@@ -133,7 +128,6 @@ refund_run (void *cls, | |||
133 | struct TALER_CoinSpendPublicKeyP coin; | 128 | struct TALER_CoinSpendPublicKeyP coin; |
134 | const json_t *contract_terms; | 129 | const json_t *contract_terms; |
135 | struct GNUNET_HashCode h_contract_terms; | 130 | struct GNUNET_HashCode h_contract_terms; |
136 | struct TALER_Amount refund_fee; | ||
137 | struct TALER_Amount refund_amount; | 131 | struct TALER_Amount refund_amount; |
138 | const struct TALER_MerchantPrivateKeyP *merchant_priv; | 132 | const struct TALER_MerchantPrivateKeyP *merchant_priv; |
139 | const struct TALER_TESTING_Command *coin_cmd; | 133 | const struct TALER_TESTING_Command *coin_cmd; |
@@ -153,19 +147,6 @@ refund_run (void *cls, | |||
153 | TALER_TESTING_interpreter_fail (is); | 147 | TALER_TESTING_interpreter_fail (is); |
154 | return; | 148 | return; |
155 | } | 149 | } |
156 | if (GNUNET_OK != | ||
157 | TALER_string_to_amount (rs->refund_fee, | ||
158 | &refund_fee)) | ||
159 | { | ||
160 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
161 | "Failed to parse amount `%s' at %u/%s\n", | ||
162 | rs->refund_fee, | ||
163 | is->ip, | ||
164 | cmd->label); | ||
165 | TALER_TESTING_interpreter_fail (is); | ||
166 | return; | ||
167 | } | ||
168 | |||
169 | coin_cmd = TALER_TESTING_interpreter_lookup_command (is, | 150 | coin_cmd = TALER_TESTING_interpreter_lookup_command (is, |
170 | rs->coin_reference); | 151 | rs->coin_reference); |
171 | if (NULL == coin_cmd) | 152 | if (NULL == coin_cmd) |
@@ -211,7 +192,6 @@ refund_run (void *cls, | |||
211 | } | 192 | } |
212 | rs->rh = TALER_EXCHANGE_refund (rs->exchange, | 193 | rs->rh = TALER_EXCHANGE_refund (rs->exchange, |
213 | &refund_amount, | 194 | &refund_amount, |
214 | &refund_fee, | ||
215 | &h_contract_terms, | 195 | &h_contract_terms, |
216 | &coin, | 196 | &coin, |
217 | rs->refund_transaction_id, | 197 | rs->refund_transaction_id, |
@@ -254,7 +234,6 @@ refund_cleanup (void *cls, | |||
254 | * @param label command label. | 234 | * @param label command label. |
255 | * @param expected_response_code expected HTTP status code. | 235 | * @param expected_response_code expected HTTP status code. |
256 | * @param refund_amount the amount to ask a refund for. | 236 | * @param refund_amount the amount to ask a refund for. |
257 | * @param refund_fee expected refund fee. | ||
258 | * @param coin_reference reference to a command that can | 237 | * @param coin_reference reference to a command that can |
259 | * provide a coin to be refunded. | 238 | * provide a coin to be refunded. |
260 | * | 239 | * |
@@ -264,7 +243,6 @@ struct TALER_TESTING_Command | |||
264 | TALER_TESTING_cmd_refund (const char *label, | 243 | TALER_TESTING_cmd_refund (const char *label, |
265 | unsigned int expected_response_code, | 244 | unsigned int expected_response_code, |
266 | const char *refund_amount, | 245 | const char *refund_amount, |
267 | const char *refund_fee, | ||
268 | const char *coin_reference) | 246 | const char *coin_reference) |
269 | { | 247 | { |
270 | struct RefundState *rs; | 248 | struct RefundState *rs; |
@@ -273,7 +251,6 @@ TALER_TESTING_cmd_refund (const char *label, | |||
273 | 251 | ||
274 | rs->expected_response_code = expected_response_code; | 252 | rs->expected_response_code = expected_response_code; |
275 | rs->refund_amount = refund_amount; | 253 | rs->refund_amount = refund_amount; |
276 | rs->refund_fee = refund_fee; | ||
277 | rs->coin_reference = coin_reference; | 254 | rs->coin_reference = coin_reference; |
278 | { | 255 | { |
279 | struct TALER_TESTING_Command cmd = { | 256 | struct TALER_TESTING_Command cmd = { |
@@ -295,7 +272,6 @@ TALER_TESTING_cmd_refund (const char *label, | |||
295 | * @param label command label. | 272 | * @param label command label. |
296 | * @param expected_response_code expected HTTP status code. | 273 | * @param expected_response_code expected HTTP status code. |
297 | * @param refund_amount the amount to ask a refund for. | 274 | * @param refund_amount the amount to ask a refund for. |
298 | * @param refund_fee expected refund fee. | ||
299 | * @param coin_reference reference to a command that can | 275 | * @param coin_reference reference to a command that can |
300 | * provide a coin to be refunded. | 276 | * provide a coin to be refunded. |
301 | * @param refund_transaction_id transaction id to use | 277 | * @param refund_transaction_id transaction id to use |
@@ -308,7 +284,6 @@ TALER_TESTING_cmd_refund_with_id | |||
308 | (const char *label, | 284 | (const char *label, |
309 | unsigned int expected_response_code, | 285 | unsigned int expected_response_code, |
310 | const char *refund_amount, | 286 | const char *refund_amount, |
311 | const char *refund_fee, | ||
312 | const char *coin_reference, | 287 | const char *coin_reference, |
313 | uint64_t refund_transaction_id) | 288 | uint64_t refund_transaction_id) |
314 | { | 289 | { |
@@ -317,7 +292,6 @@ TALER_TESTING_cmd_refund_with_id | |||
317 | rs = GNUNET_new (struct RefundState); | 292 | rs = GNUNET_new (struct RefundState); |
318 | rs->expected_response_code = expected_response_code; | 293 | rs->expected_response_code = expected_response_code; |
319 | rs->refund_amount = refund_amount; | 294 | rs->refund_amount = refund_amount; |
320 | rs->refund_fee = refund_fee; | ||
321 | rs->coin_reference = coin_reference; | 295 | rs->coin_reference = coin_reference; |
322 | rs->refund_transaction_id = refund_transaction_id; | 296 | rs->refund_transaction_id = refund_transaction_id; |
323 | { | 297 | { |