taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

/deposit: #5284.

Browse Source
This commit is contained in:
Marcello Stanisci 2018-12-18 16:09:17 +01:00
parent bb45ee0e8e
commit c38f521dd8
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
5 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/benchmark/taler-exchange-benchmark.c
View File

@ -430,7 +430,6 @@ run (void *cls,
TALER_TESTING_cmd_deposit_with_retry TALER_TESTING_cmd_deposit_with_retry
(TALER_TESTING_cmd_deposit (TALER_TESTING_cmd_deposit
("deposit", ("deposit",
is->exchange,
withdraw_label, withdraw_label,
0, /* Index of the one withdrawn coin in the traits. */ 0, /* Index of the one withdrawn coin in the traits. */
TALER_TESTING_make_wire_details TALER_TESTING_make_wire_details

26
src/exchange-lib/test_exchange_api_new.c
View File

@ -217,7 +217,7 @@ run (void *cls,
* Spend the coin. * Spend the coin.
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-simple", is->exchange, "withdraw-coin-1", 0, ("deposit-simple", "withdraw-coin-1", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
"{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}", "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
@ -236,7 +236,7 @@ run (void *cls,
* Try to double spend using different wire details. * Try to double spend using different wire details.
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-double-1", is->exchange, "withdraw-coin-1", 0, ("deposit-double-1", "withdraw-coin-1", 0,
TALER_TESTING_make_wire_details (43, TALER_TESTING_make_wire_details (43,
fakebank_url), fakebank_url),
"{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}", "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
@ -252,7 +252,7 @@ run (void *cls,
* how can a different id be generated? * how can a different id be generated?
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-double-1", is->exchange, "withdraw-coin-1", 0, ("deposit-double-1", "withdraw-coin-1", 0,
TALER_TESTING_make_wire_details (43, TALER_TESTING_make_wire_details (43,
fakebank_url), fakebank_url),
"{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}", "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
@ -262,7 +262,7 @@ run (void *cls,
* Try to double spend with different proposal. * Try to double spend with different proposal.
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-double-2", is->exchange, "withdraw-coin-1", 0, ("deposit-double-2", "withdraw-coin-1", 0,
TALER_TESTING_make_wire_details (43, TALER_TESTING_make_wire_details (43,
fakebank_url), fakebank_url),
"{\"items\":[{\"name\":\"ice cream\",\"value\":2}]}", "{\"items\":[{\"name\":\"ice cream\",\"value\":2}]}",
@ -303,7 +303,7 @@ run (void *cls,
* deposit fee) * deposit fee)
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("refresh-deposit-partial", is->exchange, ("refresh-deposit-partial",
"refresh-withdraw-coin-1", 0, "refresh-withdraw-coin-1", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
@ -343,7 +343,7 @@ run (void *cls,
* Try to spend a refreshed EUR:1 coin * Try to spend a refreshed EUR:1 coin
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("refresh-deposit-refreshed-1a", is->exchange, ("refresh-deposit-refreshed-1a",
"refresh-reveal-1-idempotency", 0, "refresh-reveal-1-idempotency", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
@ -355,7 +355,7 @@ run (void *cls,
* Try to spend a refreshed EUR:0.1 coin * Try to spend a refreshed EUR:0.1 coin
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("refresh-deposit-refreshed-1b", is->exchange, ("refresh-deposit-refreshed-1b",
"refresh-reveal-1", 3, "refresh-reveal-1", 3,
TALER_TESTING_make_wire_details (43, TALER_TESTING_make_wire_details (43,
fakebank_url), fakebank_url),
@ -494,7 +494,6 @@ run (void *cls,
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-unaggregated", ("deposit-unaggregated",
is->exchange,
"withdraw-coin-unaggregated", "withdraw-coin-unaggregated",
0, 0,
TALER_TESTING_make_wire_details TALER_TESTING_make_wire_details
@ -542,7 +541,7 @@ run (void *cls,
* receive EUR:4.99 due to 1 ct deposit fee) * receive EUR:4.99 due to 1 ct deposit fee)
*/ */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-refund-1", is->exchange, "withdraw-coin-r1", 0, ("deposit-refund-1", "withdraw-coin-r1", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
"{\"items\":[{\"name\":\"ice cream\"," "{\"items\":[{\"name\":\"ice cream\","
@ -589,7 +588,7 @@ run (void *cls,
* due to refund) (merchant would receive EUR:4.98 due to * due to refund) (merchant would receive EUR:4.98 due to
* 1 ct deposit fee) */ * 1 ct deposit fee) */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-refund-2", is->exchange, "withdraw-coin-r1", 0, ("deposit-refund-2", "withdraw-coin-r1", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
"{\"items\":[{\"name\":\"more ice cream\"," "{\"items\":[{\"name\":\"more ice cream\","
@ -641,7 +640,7 @@ run (void *cls,
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-refund-1b", is->exchange, "withdraw-coin-rb", 0, ("deposit-refund-1b", "withdraw-coin-rb", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
"{\"items\":[{\"name\":\"ice cream\"," "{\"items\":[{\"name\":\"ice cream\","
@ -804,7 +803,7 @@ run (void *cls,
MHD_HTTP_OK), MHD_HTTP_OK),
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("payback-deposit-partial", is->exchange, ("payback-deposit-partial",
"payback-withdraw-coin-2a", 0, "payback-withdraw-coin-2a", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
@ -825,7 +824,7 @@ run (void *cls,
"EUR:0.5"), "EUR:0.5"),
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("payback-deposit-revoked", is->exchange, ("payback-deposit-revoked",
"payback-withdraw-coin-2b", 0, "payback-withdraw-coin-2b", 0,
TALER_TESTING_make_wire_details (42, TALER_TESTING_make_wire_details (42,
fakebank_url), fakebank_url),
@ -840,7 +839,6 @@ run (void *cls,
* 404 on the DK! */ * 404 on the DK! */
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("payback-deposit-partial-after-payback", ("payback-deposit-partial-after-payback",
is->exchange,
"payback-withdraw-coin-2a", "payback-withdraw-coin-2a",
0, 0,
TALER_TESTING_make_wire_details TALER_TESTING_make_wire_details

3
src/exchange-lib/test_exchange_api_twisted.c
View File

@ -174,7 +174,6 @@ run (void *cls,
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("refresh-deposit-partial", ("refresh-deposit-partial",
is->exchange,
"refresh-withdraw-coin", "refresh-withdraw-coin",
0, 0,
TALER_TESTING_make_wire_details TALER_TESTING_make_wire_details
@ -236,7 +235,6 @@ run (void *cls,
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-refund-1", ("deposit-refund-1",
is->exchange,
"withdraw-coin-r1", "withdraw-coin-r1",
0, 0,
TALER_TESTING_make_wire_details TALER_TESTING_make_wire_details
@ -280,7 +278,6 @@ run (void *cls,
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
("deposit-refund-to-fail", ("deposit-refund-to-fail",
is->exchange,
"withdraw-coin-r1", "withdraw-coin-r1",
0, /* coin index. */ 0, /* coin index. */
TALER_TESTING_make_wire_details TALER_TESTING_make_wire_details

11
src/exchange-lib/testing_api_cmd_deposit.c
View File

@ -87,11 +87,6 @@ struct DepositState
*/ */
struct TALER_TESTING_Interpreter *is; struct TALER_TESTING_Interpreter *is;
/**
* Exchange connection.
*/
struct TALER_EXCHANGE_Handle *exchange;
/** /**
* Task scheduled to try later. * Task scheduled to try later.
*/ */
@ -129,7 +124,6 @@ struct DepositState
* deposit confirmation. * deposit confirmation.
*/ */
struct TALER_ExchangeSignatureP exchange_sig; struct TALER_ExchangeSignatureP exchange_sig;
}; };
@ -363,7 +357,7 @@ deposit_run (void *cls,
&coin_sig.eddsa_signature)); &coin_sig.eddsa_signature));
} }
ds->dh = TALER_EXCHANGE_deposit ds->dh = TALER_EXCHANGE_deposit
(ds->exchange, (is->exchange,
&amount, &amount,
wire_deadline, wire_deadline,
ds->wire_details, ds->wire_details,
@ -496,7 +490,6 @@ deposit_traits (void *cls,
* Create a "deposit" command. * Create a "deposit" command.
* *
* @param label command label. * @param label command label.
* @param exchange exchange connection.
* @param coin_reference reference to any operation that can * @param coin_reference reference to any operation that can
* provide a coin. * provide a coin.
* @param coin_index if @a withdraw_reference offers an array of * @param coin_index if @a withdraw_reference offers an array of
@ -518,7 +511,6 @@ deposit_traits (void *cls,
struct TALER_TESTING_Command struct TALER_TESTING_Command
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
(const char *label, (const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *coin_reference, const char *coin_reference,
unsigned int coin_index, unsigned int coin_index,
json_t *wire_details, json_t *wire_details,
@ -531,7 +523,6 @@ TALER_TESTING_cmd_deposit
struct DepositState *ds; struct DepositState *ds;
ds = GNUNET_new (struct DepositState); ds = GNUNET_new (struct DepositState);
ds->exchange = exchange;
ds->coin_reference = coin_reference; ds->coin_reference = coin_reference;
ds->coin_index = coin_index; ds->coin_index = coin_index;
ds->wire_details = wire_details; ds->wire_details = wire_details;

2
src/include/taler_testing_lib.h
View File

@ -1016,7 +1016,6 @@ TALER_TESTING_cmd_status (const char *label,
* Create a "deposit" command. * Create a "deposit" command.
* *
* @param label command label. * @param label command label.
* @param exchange exchange connection.
* @param coin_reference reference to any operation that can * @param coin_reference reference to any operation that can
* provide a coin. * provide a coin.
* @param coin_index if @a withdraw_reference offers an array of * @param coin_index if @a withdraw_reference offers an array of
@ -1036,7 +1035,6 @@ TALER_TESTING_cmd_status (const char *label,
struct TALER_TESTING_Command struct TALER_TESTING_Command
TALER_TESTING_cmd_deposit TALER_TESTING_cmd_deposit
(const char *label, (const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *coin_reference, const char *coin_reference,
unsigned int coin_index, unsigned int coin_index,
json_t *wire_details, json_t *wire_details,