update configuration generators to use new ENABLE option instead of WIREFORMATS, and to support wire fee generation

1 files changed, 11 insertions, 8 deletions

diff --git a/contrib/exchange-template/config/exchange-common.conf b/contrib/exchange-template/config/exchange-common.conf
index eddde3c32..d513b3597 100644
--- a/contrib/exchange-template/config/exchange-common.conf
+++ b/contrib/exchange-template/config/exchange-common.conf
@@ -2,10 +2,6 @@
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 
-# Wire format supported by the exchange, case-insensitive.
-# Examples for formats include 'test' for testing and 'sepa' (for EU IBAN).
-WIREFORMAT = SEPA
-
 # HTTP port the exchange listens to
 PORT = 4241
 
@@ -21,21 +17,28 @@ TESTRUN = YES
 [exchangedb-postgres]
 DB_CONN_STR = "postgres:///talercheck"
 
-[wire-incoming-sepa]
+
+[exchange-wire-sepa]
+# Change here to enable SEPA wire transfers.
+ENABLE = NO
+
+[exchange-wire-incoming-sepa]
 SEPA_RESPONSE_FILE = "sepa.json"
 
-[wire-outgoing-sepa]
+[exchange-wire-outgoing-sepa]
 SEPA_RESPONSE_FILE = "sepa.json"
 
+[exchange-wire-sepa]
+ENABLE = YES
 
-[wire-incoming-test]
+[exchange-wire-incoming-test]
 # What is the main website of the bank?
 BANK_URI = "https://bank/"
 # Into which account at the 'bank' should incoming
 # wire transfers be made?
 BANK_ACCOUNT_NUMBER = 2
 
-[wire-outgoing-test]
+[exchange-wire-outgoing-test]
 # What is the main website of the bank?
 BANK_URI = "https://bank/"
 # From which account at the 'bank' should outgoing