diff options
author | Marcello Stanisci <stanisci.m@gmail.com> | 2018-07-02 14:38:31 +0200 |
---|---|---|
committer | Marcello Stanisci <stanisci.m@gmail.com> | 2018-07-02 14:38:31 +0200 |
commit | e04cb7542503cccc000e5cc9aba4cb6f50ddaf6b (patch) | |
tree | a952540f0e5527cda66c5e98200f3374dfdc4336 | |
parent | e152251701c87dc1ac2ef3fa84aad65225070c15 (diff) | |
download | merchant-e04cb7542503cccc000e5cc9aba4cb6f50ddaf6b.tar.gz merchant-e04cb7542503cccc000e5cc9aba4cb6f50ddaf6b.tar.bz2 merchant-e04cb7542503cccc000e5cc9aba4cb6f50ddaf6b.zip |
cut unused data off from track CMDs.
-rw-r--r-- | src/include/taler_merchant_testing_lib.h | 9 | ||||
-rw-r--r-- | src/lib/test_merchant_api_new.c | 20 | ||||
-rw-r--r-- | src/lib/testing_api_cmd_track.c | 19 | ||||
-rw-r--r-- | src/merchant-tools/taler-merchant-generate-payments.c | 7 |
4 files changed, 14 insertions, 41 deletions
diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index 30116786..dface434 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -342,9 +342,7 @@ TALER_TESTING_cmd_history (const char *label, * /track/transaction request. * @param ctx CURL context. * @param http_status expected HTTP response code. - * @param transfer_reference FIXME not used. * @param pay_reference used to retrieve the order id to track. - * @param wire_fee FIXME not used. */ struct TALER_TESTING_Command TALER_TESTING_cmd_merchant_track_transaction @@ -352,9 +350,7 @@ TALER_TESTING_cmd_merchant_track_transaction const char *merchant_url, struct GNUNET_CURL_Context *ctx, unsigned int http_status, - const char *transfer_reference, - const char *pay_reference, - const char *wire_fee); + const char *pay_reference); /** * Define a "track transfer" CMD. @@ -375,8 +371,7 @@ TALER_TESTING_cmd_merchant_track_transfer const char *merchant_url, struct GNUNET_CURL_Context *ctx, unsigned int http_status, - const char *check_bank_reference, - const char *pay_reference); + const char *check_bank_reference); /* ****** Specific traits supported by this component ******* */ diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c index 17fcd5bb..b11cacac 100644 --- a/src/lib/test_merchant_api_new.c +++ b/src/lib/test_merchant_api_new.c @@ -342,25 +342,21 @@ run (void *cls, merchant_url, is->ctx, MHD_HTTP_OK, - "check_bank_transfer-498c", - "deposit-simple", - "EUR:0.01"), + "deposit-simple"), TALER_TESTING_cmd_merchant_track_transfer ("track-transfer-1", merchant_url, is->ctx, MHD_HTTP_OK, - "check_bank_transfer-498c", - "deposit-simple"), + "check_bank_transfer-498c"), TALER_TESTING_cmd_merchant_track_transfer ("track-transfer-again", merchant_url, is->ctx, MHD_HTTP_OK, - "check_bank_transfer-498c", - "deposit-simple"), + "check_bank_transfer-498c"), TALER_TESTING_cmd_fakebank_transfer ("create-reserve-2", @@ -429,25 +425,21 @@ run (void *cls, merchant_url, is->ctx, MHD_HTTP_OK, - "check_bank_transfer-498c-2", - "deposit-simple-2"), + "check_bank_transfer-498c-2"), TALER_TESTING_cmd_merchant_track_transfer ("track-transfer-2-again", merchant_url, is->ctx, MHD_HTTP_OK, - "check_bank_transfer-498c-2", - "deposit-simple-2"), + "check_bank_transfer-498c-2"), TALER_TESTING_cmd_merchant_track_transaction ("track-transaction-2", merchant_url, is->ctx, MHD_HTTP_OK, - "check_bank_transfer-498c-2", - "deposit-simple-2", - "EUR:0.01"), + "deposit-simple-2"), TALER_TESTING_cmd_history ("history-1", merchant_url, diff --git a/src/lib/testing_api_cmd_track.c b/src/lib/testing_api_cmd_track.c index 4d070d26..020c3731 100644 --- a/src/lib/testing_api_cmd_track.c +++ b/src/lib/testing_api_cmd_track.c @@ -129,10 +129,6 @@ struct TrackTransferState */ const char *check_bank_reference; - /** - * FIXME currently not used. - */ - const char *pay_reference; }; /** @@ -441,9 +437,8 @@ track_transaction_traits (void *cls, * /track/transaction request. * @param ctx CURL context. * @param http_status expected HTTP response code. - * @param transfer_reference FIXME not used. * @param pay_reference used to retrieve the order id to track. - * @param wire_fee FIXME not used. + * @return the command. */ struct TALER_TESTING_Command TALER_TESTING_cmd_merchant_track_transaction @@ -451,9 +446,7 @@ TALER_TESTING_cmd_merchant_track_transaction const char *merchant_url, struct GNUNET_CURL_Context *ctx, unsigned int http_status, - const char *transfer_reference, - const char *pay_reference, - const char *wire_fee) + const char *pay_reference) { struct TrackTransactionState *tts; struct TALER_TESTING_Command cmd; @@ -469,7 +462,6 @@ TALER_TESTING_cmd_merchant_track_transaction cmd.run = &track_transaction_run; cmd.cleanup = &track_transaction_cleanup; cmd.traits = &track_transaction_traits; - // traits? return cmd; } @@ -486,7 +478,7 @@ TALER_TESTING_cmd_merchant_track_transaction * @param check_bank_reference reference to a "check bank" CMD * that will provide the WTID and exchange URL to issue * the track against. - * @param pay_reference FIXME not used. + * @return the command. */ struct TALER_TESTING_Command TALER_TESTING_cmd_merchant_track_transfer @@ -494,8 +486,7 @@ TALER_TESTING_cmd_merchant_track_transfer const char *merchant_url, struct GNUNET_CURL_Context *ctx, unsigned int http_status, - const char *check_bank_reference, - const char *pay_reference) + const char *check_bank_reference) { struct TrackTransferState *tts; struct TALER_TESTING_Command cmd; @@ -505,13 +496,11 @@ TALER_TESTING_cmd_merchant_track_transfer tts->ctx = ctx; tts->http_status = http_status; tts->check_bank_reference = check_bank_reference; - tts->pay_reference = pay_reference; cmd.cls = tts; cmd.label = label; cmd.run = &track_transfer_run; cmd.cleanup = &track_transfer_cleanup; - // traits? return cmd; } diff --git a/src/merchant-tools/taler-merchant-generate-payments.c b/src/merchant-tools/taler-merchant-generate-payments.c index 7766c832..93cd1327 100644 --- a/src/merchant-tools/taler-merchant-generate-payments.c +++ b/src/merchant-tools/taler-merchant-generate-payments.c @@ -363,17 +363,14 @@ run (void *cls, merchant_url, is->ctx, MHD_HTTP_OK, - "dummy", // "check bank" CMD, never used, to be deleted. - "deposit-simple-2", - CURRENCY_0_01), + "deposit-simple-2"), TALER_TESTING_cmd_merchant_track_transfer ("track-transfer-1", merchant_url, is->ctx, MHD_HTTP_OK, - "track-transaction-1", - "deposit-simple-2"), + "track-transaction-1"), TALER_TESTING_cmd_rewind_ip ("rewind-tracks", |