commit ee7f59d5fc2a03af38558aaec86197a4b9027009
parent b78b9916fc317e9a0e201cd684cd8e7f694828b1
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date: Tue, 18 Dec 2018 17:46:12 +0100
#5284.
Adapting after the latest exchange's changes because of #5284 itself.
Diffstat:
3 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
@@ -176,14 +176,12 @@ run (void *cls,
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-1",
- is->exchange,
"create-reserve-1",
"EUR:5",
MHD_HTTP_OK),
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-2",
- is->exchange,
"create-reserve-1",
"EUR:5",
MHD_HTTP_OK),
@@ -192,7 +190,6 @@ run (void *cls,
* Check the reserve is depleted.
*/
TALER_TESTING_cmd_status ("withdraw-status-1",
- is->exchange,
"create-reserve-1",
"EUR:0",
MHD_HTTP_OK),
@@ -386,7 +383,6 @@ run (void *cls,
EXCHANGE_ACCOUNT_NO),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-2",
- is->exchange,
"create-reserve-2",
"EUR:5",
MHD_HTTP_OK),
@@ -535,7 +531,6 @@ run (void *cls,
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-unincreased-refund",
- is->exchange,
"create-reserve-unincreased-refund",
"EUR:5",
MHD_HTTP_OK),
@@ -825,17 +820,14 @@ run (void *cls,
"EUR:10.02", USER_ACCOUNT_NO, EXCHANGE_ACCOUNT_NO),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-10a",
- is->exchange,
"create-reserve-10",
"EUR:5",
MHD_HTTP_OK),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-10b",
- is->exchange,
"create-reserve-10",
"EUR:5",
MHD_HTTP_OK),
TALER_TESTING_cmd_status ("withdraw-status-10",
- is->exchange,
"create-reserve-10",
"EUR:0",
MHD_HTTP_OK),
@@ -907,19 +899,16 @@ run (void *cls,
EXCHANGE_ACCOUNT_NO),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-11a",
- is->exchange,
"create-reserve-11",
"EUR:5",
MHD_HTTP_OK),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-11b",
- is->exchange,
"create-reserve-11",
"EUR:5",
MHD_HTTP_OK),
TALER_TESTING_cmd_status ("withdraw-status-11",
- is->exchange,
"create-reserve-11",
"EUR:0",
MHD_HTTP_OK),
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
@@ -489,7 +489,6 @@ run (void *cls,
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-unaggregation",
- is->exchange,
"create-reserve-unaggregation",
"EUR:5",
MHD_HTTP_OK),
@@ -552,13 +551,11 @@ run (void *cls,
EXCHANGE_ACCOUNT_NO),
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-5383a",
- is->exchange,
"create-reserve-5383",
"EUR:1",
MHD_HTTP_OK),
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-5383b",
- is->exchange,
"create-reserve-5383",
"EUR:1",
MHD_HTTP_OK),
@@ -642,17 +639,14 @@ run (void *cls,
("track_chunk_check_empty-a"),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1",
- is->exchange,
"create-reserve-1",
"EUR:1",
MHD_HTTP_OK),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-2",
- is->exchange,
"create-reserve-1",
"EUR:1",
MHD_HTTP_OK),
TALER_TESTING_cmd_status ("withdraw-status",
- is->exchange,
"create-reserve-1",
"EUR:0",
MHD_HTTP_OK),
@@ -766,13 +760,11 @@ run (void *cls,
"EUR:1.01", USER_ACCOUNT_NO, EXCHANGE_ACCOUNT_NO),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-abort-1",
- is->exchange,
"create-reserve-abort-1",
"EUR:1",
MHD_HTTP_OK),
TALER_TESTING_cmd_status ("withdraw-status-abort-1",
- is->exchange,
"create-reserve-abort-1",
"EUR:0",
MHD_HTTP_OK),
@@ -906,7 +898,6 @@ run (void *cls,
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-double-spend",
- is->exchange,
"create-reserve-double-spend",
"EUR:1",
MHD_HTTP_OK),
diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c
@@ -335,14 +335,12 @@ run (void *cls,
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-1",
- is->exchange, // picks port from config's [exchange].
"create-reserve-1",
CURRENCY_5,
MHD_HTTP_OK),
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-2",
- is->exchange,
"create-reserve-1",
CURRENCY_5,
MHD_HTTP_OK),
@@ -350,7 +348,6 @@ run (void *cls,
TALER_TESTING_cmd_proposal
("create-proposal-1",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
order_worth_5,
NULL),
@@ -358,7 +355,6 @@ run (void *cls,
TALER_TESTING_cmd_pay
("deposit-simple",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
"create-proposal-1",
"withdraw-coin-1",
@@ -378,7 +374,6 @@ run (void *cls,
TALER_TESTING_cmd_proposal
("create-proposal-2",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
order_worth_5_track,
NULL),
@@ -386,7 +381,6 @@ run (void *cls,
TALER_TESTING_cmd_pay
("deposit-simple-2",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
"create-proposal-2",
"withdraw-coin-2",
@@ -403,14 +397,12 @@ run (void *cls,
TALER_TESTING_cmd_merchant_track_transaction
("track-transaction-1",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
"deposit-simple-2"),
TALER_TESTING_cmd_merchant_track_transfer
("track-transfer-1",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
"track-transaction-1"),
@@ -434,7 +426,6 @@ run (void *cls,
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-1",
- is->exchange,
"create-reserve-1",
CURRENCY_5,
MHD_HTTP_OK),
@@ -442,7 +433,6 @@ run (void *cls,
TALER_TESTING_cmd_proposal
("create-unaggregated-proposal",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
order_worth_5_unaggregated,
alt_instance),
@@ -450,7 +440,6 @@ run (void *cls,
TALER_TESTING_cmd_pay
("deposit-unaggregated",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
"create-unaggregated-proposal",
"withdraw-coin-1",
@@ -473,14 +462,12 @@ run (void *cls,
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-2",
- is->exchange,
"create-reserve-2",
CURRENCY_5,
MHD_HTTP_OK),
TALER_TESTING_cmd_withdraw_amount
("withdraw-coin-3",
- is->exchange,
"create-reserve-2",
CURRENCY_5,
MHD_HTTP_OK),
@@ -488,7 +475,6 @@ run (void *cls,
TALER_TESTING_cmd_proposal
("create-twocoins-proposal",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
order_worth_10_2coins,
NULL),
@@ -496,7 +482,6 @@ run (void *cls,
TALER_TESTING_cmd_pay
("deposit-twocoins",
merchant_url,
- is->ctx,
MHD_HTTP_OK,
"create-twocoins-proposal",
"withdraw-coin-2;withdraw-coin-3",
