diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-04-02 14:24:45 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-04-02 14:29:44 +0200 |
| commit | cb55c1a3af9f56a6da38e5589e72df0b70d355b1 (patch) | |
| tree | 5f9a3af7d9073249f77ce56c690844a6cb27c3e7 /src/benchmark | |
| parent | 7a20062bafed42f937c5388aed09042aad7014c0 (diff) | |
Changing configuration structure to enable multiple accounts.
This change enables using multiple wire plugins at the same time.
Also, we now distinguish between the wire plugin (i.e. EBICS or
taler_bank) and the wire method (i.e. SEPA or x-taler-bank) that
the wire plugin is implementing. The "taler-bank" wire method
was renamed from "test" to "x-taler-bank".
This also changes the format of the /wire response of the exchange,
as we now need to return multiple accounts. Note that wire fees
are specified per wire method, not per wire account.
taler-exchange-keyup now automatically signs all of the /wire
responses in the location specified by the configuration.
Account identification in wire plugins was changed to use
payto://-URLs instead of method-specific JSON fields. Signing
and validation of /wire responses was moved from each wire
plugin to a generic validation method in libtalerutil (crypto)
or libtalerjson (for JSON-formatted inputs).
Convenience methods were added to generate JSON for wire accounts
(salting, signing).
Various section and option names were adjusted to streamline the
configuration and make it more consistent overall. Documentation
was updated as well.
Diffstat (limited to 'src/benchmark')
| -rw-r--r-- | src/benchmark/taler-exchange-benchmark.c | 4 | ||||
| -rw-r--r-- | src/benchmark/taler-exchange-benchmark.conf | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index fbdfe825c..3fd31eda7 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -895,8 +895,8 @@ spend_coin (struct Coin *coin, dr.purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_DEPOSIT); dr.h_contract_terms = h_contract_terms; GNUNET_assert (GNUNET_OK == - TALER_JSON_hash (merchant_details, - &dr.h_wire)); + TALER_JSON_wire_signature_hash (merchant_details, + &dr.h_wire)); dr.timestamp = GNUNET_TIME_absolute_hton (timestamp); dr.refund_deadline = GNUNET_TIME_absolute_hton (refund_deadline); diff --git a/src/benchmark/taler-exchange-benchmark.conf b/src/benchmark/taler-exchange-benchmark.conf index 453782c7c..887673850 100644 --- a/src/benchmark/taler-exchange-benchmark.conf +++ b/src/benchmark/taler-exchange-benchmark.conf @@ -20,22 +20,20 @@ DB = postgres MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG [exchangedb-postgres] -DB_CONN_STR = "postgres:///talercheck" +CONFIG = "postgres:///talercheck" -[exchange-wire-test] -# Enable 'test' for testing of the actual coin operations. -ENABLE = YES +[account-exchange] # What is the main website of the bank? # (Not used unless the aggregator is run.) -BANK_URL = "http://localhost:8082/" -# From which account at the 'bank' should outgoing wire transfers be made? -BANK_ACCOUNT_NUMBER = 2 +URL = "payto://x-taler-bank/localhost:8082/2" # This is the response we give out for the /wire request. It provides # wallets with the bank information for transfers to the exchange. -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/test.json +WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account.json + +[fees-x-taler-bank] WIRE-FEE-2017 = KUDOS:0.01 WIRE-FEE-2018 = KUDOS:0.01 WIRE-FEE-2019 = KUDOS:0.01 |