-fix port

This commit is contained in:
Christian Grothoff 2023-04-24 21:15:04 +02:00
parent 505170ce1f
commit 1a3dbf8c98
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 90 additions and 80 deletions

View File

@ -8,9 +8,6 @@
# only seeks the exchange/BASE_URL URL to connect to the exchange. # only seeks the exchange/BASE_URL URL to connect to the exchange.
BASE_URL = "http://localhost:8888/" BASE_URL = "http://localhost:8888/"
[bank]
HTTP_PORT = 8082
[twister] [twister]
# HTTP listen port for twister # HTTP listen port for twister
HTTP_PORT = 8888 HTTP_PORT = 8888
@ -30,4 +27,3 @@ ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/taler-service-twister.sock UNIXPATH = /tmp/taler-service-twister.sock
UNIX_MATCH_UID = NO UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES UNIX_MATCH_GID = YES

View File

@ -1,6 +1,6 @@
/* /*
This file is part of TALER This file is part of TALER
Copyright (C) 2014-2020 Taler Systems SA Copyright (C) 2014-2023 Taler Systems SA
TALER is free software; you can redistribute it and/or modify TALER is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as it under the terms of the GNU General Public License as
@ -112,8 +112,9 @@ run (void *cls,
* response from a refresh-reveal operation. * response from a refresh-reveal operation.
*/ */
struct TALER_TESTING_Command refresh_409_conflict[] = { struct TALER_TESTING_Command refresh_409_conflict[] = {
CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve", CMD_TRANSFER_TO_EXCHANGE (
"EUR:5.01"), "refresh-create-reserve",
"EUR:5.01"),
/** /**
* Make previous command effective. * Make previous command effective.
*/ */
@ -121,34 +122,38 @@ run (void *cls,
/** /**
* Withdraw EUR:5. * Withdraw EUR:5.
*/ */
TALER_TESTING_cmd_withdraw_amount ("refresh-withdraw-coin", TALER_TESTING_cmd_withdraw_amount (
"refresh-create-reserve", "refresh-withdraw-coin",
"EUR:5", "refresh-create-reserve",
0, /* age restriction off */ "EUR:5",
MHD_HTTP_OK), 0, /* age restriction off */
TALER_TESTING_cmd_deposit ("refresh-deposit-partial", MHD_HTTP_OK),
"refresh-withdraw-coin", TALER_TESTING_cmd_deposit (
0, "refresh-deposit-partial",
bc.user42_payto, "refresh-withdraw-coin",
"{\"items\":[{\"name\":\"ice cream\",\ 0,
\"value\":\"EUR:1\"}]}", bc.user42_payto,
GNUNET_TIME_UNIT_ZERO, "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}",
"EUR:1", GNUNET_TIME_UNIT_ZERO,
MHD_HTTP_OK), "EUR:1",
MHD_HTTP_OK),
/** /**
* Melt the rest of the coin's value * Melt the rest of the coin's value
* (EUR:4.00 = 3x EUR:1.03 + 7x EUR:0.13) */ * (EUR:4.00 = 3x EUR:1.03 + 7x EUR:0.13) */
TALER_TESTING_cmd_melt ("refresh-melt", TALER_TESTING_cmd_melt (
"refresh-withdraw-coin", "refresh-melt",
MHD_HTTP_OK, "refresh-withdraw-coin",
NULL), MHD_HTTP_OK,
NULL),
/* Trigger 409 Conflict. */ /* Trigger 409 Conflict. */
TALER_TESTING_cmd_flip_upload ("flip-upload", TALER_TESTING_cmd_flip_upload (
config_file, "flip-upload",
"transfer_privs.0"), config_file,
TALER_TESTING_cmd_refresh_reveal ("refresh-(flipped-)reveal", "transfer_privs.0"),
"refresh-melt", TALER_TESTING_cmd_refresh_reveal (
MHD_HTTP_CONFLICT), "refresh-(flipped-)reveal",
"refresh-melt",
MHD_HTTP_CONFLICT),
TALER_TESTING_cmd_end () TALER_TESTING_cmd_end ()
}; };
@ -159,23 +164,25 @@ run (void *cls,
* lib test suite. * lib test suite.
*/ */
struct TALER_TESTING_Command refund[] = { struct TALER_TESTING_Command refund[] = {
CMD_TRANSFER_TO_EXCHANGE ("create-reserve-r1", CMD_TRANSFER_TO_EXCHANGE (
"EUR:5.01"), "create-reserve-r1",
"EUR:5.01"),
CMD_EXEC_WIREWATCH ("wirewatch-r1"), CMD_EXEC_WIREWATCH ("wirewatch-r1"),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-r1", TALER_TESTING_cmd_withdraw_amount (
"create-reserve-r1", "withdraw-coin-r1",
"EUR:5", "create-reserve-r1",
0, /* age restriction off */ "EUR:5",
MHD_HTTP_OK), 0, /* age restriction off */
TALER_TESTING_cmd_deposit ("deposit-refund-1", MHD_HTTP_OK),
"withdraw-coin-r1", TALER_TESTING_cmd_deposit (
0, "deposit-refund-1",
bc.user42_payto, "withdraw-coin-r1",
"{\"items\":[{\"name\":\"ice cream\"," 0,
"\"value\":\"EUR:5\"}]}", bc.user42_payto,
GNUNET_TIME_UNIT_MINUTES, "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:5\"}]}",
"EUR:5", GNUNET_TIME_UNIT_MINUTES,
MHD_HTTP_OK), "EUR:5",
MHD_HTTP_OK),
TALER_TESTING_cmd_refund ("refund-currency-mismatch", TALER_TESTING_cmd_refund ("refund-currency-mismatch",
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
"USD:5", "USD:5",
@ -190,18 +197,18 @@ run (void *cls,
/* This next deposit CMD is only used to provide a /* This next deposit CMD is only used to provide a
* good merchant signature to the next (failing) refund * good merchant signature to the next (failing) refund
* operations. */ * operations. */
TALER_TESTING_cmd_deposit ("deposit-refund-to-fail", TALER_TESTING_cmd_deposit (
"withdraw-coin-r1", "deposit-refund-to-fail",
0, /* coin index. */ "withdraw-coin-r1",
bc.user42_payto, 0, /* coin index. */
/* This parameter will make any comparison about bc.user42_payto,
h_contract_terms fail, when /refund will be handled. /* This parameter will make any comparison about
So in other words, this is h_contract mismatch. */ h_contract_terms fail, when /refund will be handled.
"{\"items\":[{\"name\":\"ice skate\"," So in other words, this is h_contract mismatch. */
"\"value\":\"EUR:5\"}]}", "{\"items\":[{\"name\":\"ice skate\",\"value\":\"EUR:5\"}]}",
GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_MINUTES,
"EUR:5", "EUR:5",
MHD_HTTP_CONFLICT), MHD_HTTP_CONFLICT),
TALER_TESTING_cmd_refund ("refund-deposit-not-found", TALER_TESTING_cmd_refund ("refund-deposit-not-found",
MHD_HTTP_NOT_FOUND, MHD_HTTP_NOT_FOUND,
"EUR:5", "EUR:5",
@ -219,10 +226,11 @@ run (void *cls,
* are out of date. * are out of date.
*/ */
struct TALER_TESTING_Command expired_keys[] = { struct TALER_TESTING_Command expired_keys[] = {
TALER_TESTING_cmd_modify_header_dl ("modify-expiration", TALER_TESTING_cmd_modify_header_dl (
config_file, "modify-expiration",
MHD_HTTP_HEADER_EXPIRES, config_file,
"Wed, 19 Jan 586524 08:01:49 GMT"), MHD_HTTP_HEADER_EXPIRES,
"Wed, 19 Jan 586524 08:01:49 GMT"),
TALER_TESTING_cmd_check_keys_pull_all_keys ( TALER_TESTING_cmd_check_keys_pull_all_keys (
"check-keys-expiration-0", "check-keys-expiration-0",
2), 2),
@ -232,28 +240,34 @@ run (void *cls,
CMD_TRANSFER_TO_EXCHANGE ("create-reserve-r2", CMD_TRANSFER_TO_EXCHANGE ("create-reserve-r2",
"EUR:55.01"), "EUR:55.01"),
CMD_EXEC_WIREWATCH ("wirewatch-r2"), CMD_EXEC_WIREWATCH ("wirewatch-r2"),
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-r2", TALER_TESTING_cmd_withdraw_amount (
"create-reserve-r2", "withdraw-coin-r2",
"EUR:5", "create-reserve-r2",
0, /* age restriction off */ "EUR:5",
MHD_HTTP_OK), 0, /* age restriction off */
MHD_HTTP_OK),
TALER_TESTING_cmd_end () TALER_TESTING_cmd_end ()
}; };
#endif #endif
struct TALER_TESTING_Command commands[] = { struct TALER_TESTING_Command commands[] = {
TALER_TESTING_cmd_wire_add ("add-wire-account", TALER_TESTING_cmd_wire_add (
"payto://x-taler-bank/localhost/2?receiver-name=2", "add-wire-account",
MHD_HTTP_NO_CONTENT, "payto://x-taler-bank/localhost/2?receiver-name=2",
false), MHD_HTTP_NO_CONTENT,
TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys", false),
config_file), TALER_TESTING_cmd_exec_offline_sign_keys (
TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys", "offline-sign-future-keys",
1), config_file),
TALER_TESTING_cmd_batch ("refresh-reveal-409-conflict", TALER_TESTING_cmd_check_keys_pull_all_keys (
refresh_409_conflict), "refetch /keys",
TALER_TESTING_cmd_batch ("refund", 1),
refund), TALER_TESTING_cmd_batch (
"refresh-reveal-409-conflict",
refresh_409_conflict),
TALER_TESTING_cmd_batch (
"refund",
refund),
#if 0 #if 0
TALER_TESTING_cmd_batch ("expired-keys", TALER_TESTING_cmd_batch ("expired-keys",
expired_keys), expired_keys),