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

/track/*: #5284.

Browse Source
This commit is contained in:
Marcello Stanisci 2018-12-18 16:46:16 +01:00
parent baf95b86e2
commit ce36e23a88
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,7 +381,7 @@ run (void *cls,
* the exchange knows about the deposit, but has no WTID yet.
*/
TALER_TESTING_cmd_track_transaction
("deposit-wtid-found", is->exchange,
("deposit-wtid-found",
"deposit-simple", 0, MHD_HTTP_ACCEPTED, NULL),
/**
@ -390,7 +390,7 @@ run (void *cls,
* exchange does NOT know about the deposit.
*/
TALER_TESTING_cmd_track_transaction
("deposit-wtid-failing", is->exchange,
("deposit-wtid-failing",
"deposit-double-2", 0, MHD_HTTP_NOT_FOUND, NULL),
/**
@ -399,7 +399,7 @@ run (void *cls,
* WTID value for any transaction.
*/
TALER_TESTING_cmd_track_transfer_empty
("wire-deposit-failing", is->exchange,
("wire-deposit-failing",
NULL, 0, MHD_HTTP_NOT_FOUND),
/**
@ -445,16 +445,16 @@ run (void *cls,
TALER_TESTING_cmd_check_bank_empty ("check_bank_empty"),
TALER_TESTING_cmd_track_transaction
("deposit-wtid-ok", is->exchange,
("deposit-wtid-ok",
"deposit-simple", 0, MHD_HTTP_OK, "check_bank_transfer-499c"),
TALER_TESTING_cmd_track_transfer
("wire-deposit-success-bank", is->exchange,
("wire-deposit-success-bank",
"check_bank_transfer-99c1", 0, MHD_HTTP_OK, "EUR:0.98",
"EUR:0.01"),
TALER_TESTING_cmd_track_transfer
("wire-deposits-success-wtid", is->exchange,
("wire-deposits-success-wtid",
"deposit-wtid-ok", 0, MHD_HTTP_OK, "EUR:4.98",
"EUR:0.01"),

23
src/exchange-lib/testing_api_cmd_track.c
View File

@ -67,11 +67,6 @@ struct TrackTransactionState
*/
struct TALER_EXCHANGE_TrackTransactionHandle *tth;
/**
* Handle to the exchange.
*/
struct TALER_EXCHANGE_Handle *exchange;
/**
* Interpreter state.
*/
@ -132,11 +127,6 @@ struct TrackTransferState
*/
struct TALER_EXCHANGE_TrackTransferHandle *tth;
/**
* Connection handle to the exchange.
*/
struct TALER_EXCHANGE_Handle *exchange;
/**
* Interpreter state.
*/
@ -339,7 +329,7 @@ track_transaction_run (void *cls,
}
tts->tth = TALER_EXCHANGE_track_transaction
(tts->exchange,
(is->exchange,
(struct TALER_MerchantPrivateKeyP *) merchant_priv,
&h_wire_details,
&h_contract_terms,
@ -410,7 +400,6 @@ track_transaction_traits (void *cls,
* Create a "track transaction" command.
*
* @param label the command label.
* @param exchange the exchange to connect to.
* @param transaction_reference reference to a deposit operation,
* will be used to get the input data for the track.
* @param coin_index index of the coin involved in the transaction.
@ -424,7 +413,6 @@ track_transaction_traits (void *cls,
struct TALER_TESTING_Command
TALER_TESTING_cmd_track_transaction
(const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *transaction_reference,
unsigned int coin_index,
unsigned int expected_response_code,
@ -434,7 +422,6 @@ TALER_TESTING_cmd_track_transaction
struct TrackTransactionState *tts;
tts = GNUNET_new (struct TrackTransactionState);
tts->exchange = exchange;
tts->transaction_reference = transaction_reference;
tts->expected_response_code = expected_response_code;
tts->bank_transfer_reference = bank_transfer_reference;
@ -725,7 +712,7 @@ track_transfer_run (void *cls,
}
GNUNET_assert (NULL != wtid_ptr);
}
tts->tth = TALER_EXCHANGE_track_transfer (tts->exchange,
tts->tth = TALER_EXCHANGE_track_transfer (is->exchange,
wtid_ptr,
&track_transfer_cb,
tts);
@ -739,7 +726,6 @@ track_transfer_run (void *cls,
* when a bogus WTID was passed.
*
* @param label the command label
* @param exchange connection to the exchange.
* @param wtid_reference reference to any command which can provide
* a wtid. If NULL is given, then a all zeroed WTID is
* used that will at 99.9999% probability NOT match any
@ -753,7 +739,6 @@ track_transfer_run (void *cls,
struct TALER_TESTING_Command
TALER_TESTING_cmd_track_transfer_empty
(const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *wtid_reference,
unsigned int index,
unsigned int expected_response_code)
@ -766,7 +751,6 @@ TALER_TESTING_cmd_track_transfer_empty
tts->wtid_reference = wtid_reference;
tts->index = index;
tts->expected_response_code = expected_response_code;
tts->exchange = exchange;
cmd.cls = tts;
cmd.label = label;
@ -781,7 +765,6 @@ TALER_TESTING_cmd_track_transfer_empty
* wire fee are expected.
*
* @param label the command label.
* @param exchange connection to the exchange.
* @param wtid_reference reference to any command which can provide
* a wtid. Will be the one tracked.
* @param index in case there are multiple WTID offered, this
@ -796,7 +779,6 @@ TALER_TESTING_cmd_track_transfer_empty
struct TALER_TESTING_Command
TALER_TESTING_cmd_track_transfer
(const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *wtid_reference,
unsigned int index,
unsigned int expected_response_code,
@ -811,7 +793,6 @@ TALER_TESTING_cmd_track_transfer
tts->wtid_reference = wtid_reference;
tts->index = index;
tts->expected_response_code = expected_response_code;
tts->exchange = exchange;
tts->expected_total_amount = expected_total_amount;
tts->expected_wire_fee = expected_wire_fee;

6
src/include/taler_testing_lib.h
View File

@ -1161,7 +1161,6 @@ TALER_TESTING_cmd_refresh_link_with_retry (struct TALER_TESTING_Command cmd);
* Create a "track transaction" command.
*
* @param label the command label.
* @param exchange the exchange to connect to.
* @param transaction_reference reference to a deposit operation,
* will be used to get the input data for the track.
* @param coin_index index of the coin involved in the transaction.
@ -1175,7 +1174,6 @@ TALER_TESTING_cmd_refresh_link_with_retry (struct TALER_TESTING_Command cmd);
struct TALER_TESTING_Command
TALER_TESTING_cmd_track_transaction
(const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *transaction_reference,
unsigned int coin_index,
unsigned int expected_response_code,
@ -1188,7 +1186,6 @@ TALER_TESTING_cmd_track_transaction
* when a bogus WTID was passed.
*
* @param label the command label
* @param exchange connection to the exchange.
* @param wtid_reference reference to any command which can provide
* a wtid. If NULL is given, then a all zeroed WTID is
* used that will at 99.9999% probability NOT match any
@ -1202,7 +1199,6 @@ TALER_TESTING_cmd_track_transaction
struct TALER_TESTING_Command
TALER_TESTING_cmd_track_transfer_empty
(const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *wtid_reference,
unsigned int index,
unsigned int expected_response_code);
@ -1213,7 +1209,6 @@ TALER_TESTING_cmd_track_transfer_empty
* wire fee are expected.
*
* @param label the command label.
* @param exchange connection to the exchange.
* @param wtid_reference reference to any command which can provide
* a wtid. Will be the one tracked.
* @param index in case there are multiple WTID offered, this
@ -1228,7 +1223,6 @@ TALER_TESTING_cmd_track_transfer_empty
struct TALER_TESTING_Command
TALER_TESTING_cmd_track_transfer
(const char *label,
struct TALER_EXCHANGE_Handle *exchange,
const char *wtid_reference,
unsigned int index,
unsigned int expected_response_code,