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

lookahead/duration options are in [exchange], not [exchange_keys], use consistently

Browse Source
This commit is contained in:
Christian Grothoff 2018-07-04 00:43:24 +02:00
parent bc5d9b492f
commit 52fa78b448
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
8 changed files with 44 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/benchmark/taler-exchange-benchmark.conf
View File

@ -19,6 +19,8 @@ DB = postgres
# Master public key used to sign the exchange's various keys
MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
[exchangedb-postgres]
CONFIG = "postgres:///talercheck"
@ -26,7 +28,15 @@ CONFIG = "postgres:///talercheck"
# What is the main website of the bank?
# (Not used unless the aggregator is run.)
URL = "payto://x-taler-bank/localhost:8082/2"
URL = "payto://x-taler-bank/localhost:8082/3"
PLUGIN = "taler_bank"
ENABLE_CREDIT = YES
ENABLE_DEBIT = YES
TALER_BANK_AUTH_METHOD = NONE
# This is the response we give out for the /wire request. It provides
# wallets with the bank information for transfers to the exchange.

5
src/benchmark/test_benchmark_home/.config/taler/account.json Normal file
View File

@ -0,0 +1,5 @@
{
"url": "payto://x-taler-bank/localhost:8082/3",
"salt": "KQV3VNMKGQVMMS9QWKZ5T5R7XJ0BN31019P5B8RVVNCH120ARF13B1T8FYXCNZVB3TZHEBQP0H8HY0MJ83TKBJ8Q7RXSM182TP17TAR",
"master_sig": "0VF39WRA844BCMSSKSYVZMXKCRVT38H72CT17N6184Z7PHWAKFC9RJCHB8TW1MNQ6N170SPS16JE4WJB4P004FNPQC7GGZG01ZB0G2R"
}

9
src/benchmark/test_benchmark_home/.config/taler/sepa.json
View File

@ -1,9 +0,0 @@
{
"name": "Max Musterman",
"bic": "COBADEFF370",
"type": "sepa",
"sig": "4EVRC2MCJPXQC8MC00831DNWEXMZAP4JQDDE1A7R6KR3MANG24RC1VQ55AX5A2E35S58VW1VSTENFTPHG5MWG9BSN8B8WXSV21KKW20",
"address": "Musterstadt",
"salt": "3KTM1ZRMWGEQPQ254S4R5R4Q8XM0ZYWTCTE01TZ76MVBSQ6RX7A5DR08WXVH1DCHR1R7ACRB7X0EVC2XDW1CBZM9WFSD9TRMZ90BR98",
"iban": "DE89370400440532013000"
}

7
src/exchange-lib/test_exchange_api.conf
View File

@ -9,7 +9,7 @@ TALER_TEST_HOME = test_exchange_api_home/
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
[exchange_keys]
[exchange]
# how long is one signkey valid?
signkey_duration = 4 weeks
@ -17,15 +17,10 @@ signkey_duration = 4 weeks
# how long are the signatures with the signkey valid?
legal_duration = 2 years
# how long do we generate denomination and signing keys
# ahead of time?
lookahead_sign = 32 weeks 1 day
# how long do we provide to clients denomination and signing keys
# ahead of time?
lookahead_provide = 4 weeks 1 day
[exchange]
# HTTP port the exchange listens to
PORT = 8081

12
src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
View File

@ -8,7 +8,7 @@ TALER_TEST_HOME = test_exchange_api_home/
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
[exchange_keys]
[exchange]
# how long is one signkey valid?
signkey_duration = 4 weeks
@ -16,16 +16,13 @@ signkey_duration = 4 weeks
# how long are the signatures with the signkey valid?
legal_duration = 2 years
# how long do we generate denomination and signing keys
# ahead of time?
lookahead_sign = 32 weeks 1 day
# how long do we provide to clients denomination and signing keys
# ahead of time?
lookahead_provide = 4 weeks 1 day
# Keep it short so we can prolong later!
LOOKAHEAD_SIGN = 60 s
[exchange]
# HTTP port the exchange listens to
PORT = 8081
@ -40,9 +37,6 @@ DB = postgres
# exchange (or the twister) is actually listening.
BASE_URL = "http://localhost:8081/"
# Keep it short so we can prolong later!
LOOKAHEAD_SIGN = 60 s
[exchangedb-postgres]
CONFIG = "postgres:///talercheck"

19
src/exchange-lib/test_exchange_api_twisted.conf
View File

@ -33,23 +33,20 @@ TALER_TEST_HOME = test_exchange_api_home/
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
[exchange_keys]
[exchange]
# how long is one signkey valid?
signkey_duration = 4 weeks
SIGNKEY_DURATION = 4 weeks
# how long are the signatures with the signkey valid?
legal_duration = 2 years
# how long do we generate denomination and signing keys
# ahead of time?
lookahead_sign = 32 weeks 1 day
LEGAL_DURATION = 2 years
# how long do we provide to clients denomination and signing keys
# ahead of time?
lookahead_provide = 4 weeks 1 day
LOOKAHEAD_PROVIDE = 4 weeks 1 day
[exchange]
# Keep it short so the test runs fast.
LOOKAHEAD_SIGN = 12 h
# HTTP port the exchange listens to
PORT = 8081
@ -73,10 +70,6 @@ DB_CONN_STR = "postgres:///talercheck"
[auditordb-postgres]
DB_CONN_STR = "postgres:///talercheck"
[exchange_keys]
# Keep it short so the test runs fast.
LOOKAHEAD_SIGN = 12 h
[account-2]
URL = payto://x-taler-bank/localhost:8082/2
PLUGIN = taler_bank

8
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -572,13 +572,13 @@ TALER_EXCHANGE_conf_duration_provide ()
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (cfg,
"exchange_keys",
"lookahead_provide",
"exchange",
"LOOKAHEAD_PROVIDE",
&rel))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"exchange_keys",
"lookahead_provide",
"exchange",
"LOOKAHEAD_PROVIDE",
"time value required");
GNUNET_assert (0);
}

32
src/exchange/test_taler_exchange_httpd.conf
View File

@ -2,24 +2,6 @@
# Persistant data storage for the testcase
TALER_TEST_HOME = test_taler_exchange_httpd_home/
[exchange_keys]
# how long is one signkey valid?
signkey_duration = 4 weeks
# how long are the signatures with the signkey valid?
legal_duration = 2 years
# how long do we generate denomination and signing keys
# ahead of time?
lookahead_sign = 32 weeks 1 day
# how long do we provide to clients denomination and signing keys
# ahead of time?
lookahead_provide = 4 weeks 1 day
[taler]
# Currency supported by the exchange (can only be one)
CURRENCY = EUR
@ -27,6 +9,20 @@ CURRENCY = EUR
[exchange]
# how long is one signkey valid?
SIGNKEY_DURATION = 4 weeks
# how long are the signatures with the signkey valid?
LEGAL_DURATION = 2 years
# how long do we generate denomination and signing keys
# ahead of time?
LOOKAHEAD_SIGN = 32 weeks 1 day
# how long do we provide to clients denomination and signing keys
# ahead of time?
LOOKAHEAD_PROVIDE = 4 weeks 1 day
# HTTP port the exchange listens to
PORT = 8081