6 files changed, 9 insertions, 16 deletions
diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate
index b2e222929..8af08280f 100755
--- a/src/exchange/taler-config-generate
+++ b/src/exchange/taler-config-generate
@@ -187,21 +187,21 @@ then
 # If possible, initialize outgoing wire account details ('test' method only)
     if (test "test" = "$WMETHOD" -a ! -z "$ARG_BANK_URI")
     then
-      $CS -s exchange-wire-outgoing-test -o BANK_URI -V "$ARG_BANK_URI" || exit 1
+      $CS -s exchange-wire-test -o BANK_URI -V "$ARG_BANK_URI" || exit 1
     else
-      echo "Skipped generating outgoing wire account details for exchange"
+      echo "Skipped generating wire account details for exchange"
     fi
     if (test "test" = "$ARG_W" -a ! -z "$ARG_EXCHANGE_BANK_ACCOUNT")
     then
-      $CS -s exchange-wire-outgoing-test -o BANK_ACCOUNT_NUMBER -V "$ARG_EXCHANGE_BANK_ACCOUNT" || exit 1
+      $CS -s exchange-wire-test -o BANK_ACCOUNT_NUMBER -V "$ARG_EXCHANGE_BANK_ACCOUNT" || exit 1
     else
-      echo "Skipped generating outgoing wire account details for exchange"
+      echo "Skipped generating wire account details for exchange"
     fi
 
 # If possible, initialize /wire response from JSON (with signature)
     if (test ! -z $ARG_JE)
     then
-      JSONF=`$CS -s exchange-wire-incoming-${ARG_W} -o ${ARG_W}_RESPONSE_FILE -f`
+      JSONF=`$CS -s exchange-wire-${ARG_W} -o ${ARG_W}_RESPONSE_FILE -f`
 #    echo "Generating /wire response at $JSONF"
       mkdir -p `dirname $JSONF`
       taler-exchange-wire -c "$ARG_CONFIG" -t "$ARG_W" -j "$ARG_JE" -m "$MASTER_KEY" -o "$JSONF" || exit 1
diff --git a/src/exchange/taler-exchange-httpd_validation.c b/src/exchange/taler-exchange-httpd_validation.c
index 5d86e7a9b..bef6aec59 100644
--- a/src/exchange/taler-exchange-httpd_validation.c
+++ b/src/exchange/taler-exchange-httpd_validation.c
@@ -207,12 +207,10 @@ TEH_json_validate_wireformat (const json_t *wire,
  * Obtain JSON of the supported wire methods for a given
  * account name prefix.
  *
- * @param prefix prefix for the account, the suffix will
- *        be determined by the name of the plugin
  * @return JSON array with the supported validation methods
  */
 json_t *
-TEH_VALIDATION_get_wire_methods (const char *prefix)
+TEH_VALIDATION_get_wire_methods ()
 {
   json_t *methods;
   char *account_name;
@@ -227,8 +225,7 @@ TEH_VALIDATION_get_wire_methods (const char *prefix)
     json_t *fees;
 
     GNUNET_asprintf (&account_name,
-                     "%s-%s",
-                     prefix,
+                     "exchange-wire-%s",
                      p->type);
     method = plugin->get_wire_details (plugin->cls,
                                        cfg,
diff --git a/src/exchange/taler-exchange-httpd_validation.h b/src/exchange/taler-exchange-httpd_validation.h
index 7d623bf5c..d910da74f 100644
--- a/src/exchange/taler-exchange-httpd_validation.h
+++ b/src/exchange/taler-exchange-httpd_validation.h
@@ -61,12 +61,10 @@ TEH_json_validate_wireformat (const json_t *wire,
  * Obtain JSON of the supported wire methods for a given
  * account name prefix.
  *
- * @param prefix prefix for the account, the suffix will
- *        be determined by the name of the plugin
  * @return JSON array with the supported validation methods
  */
 json_t *
-TEH_VALIDATION_get_wire_methods (const char *prefix);
+TEH_VALIDATION_get_wire_methods (void);
 
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c
index 22581ab65..69b800ff8 100644
--- a/src/exchange/taler-exchange-httpd_wire.c
+++ b/src/exchange/taler-exchange-httpd_wire.c
@@ -143,7 +143,7 @@ TEH_WIRE_handler_wire (struct TEH_RequestHandler *rh,
 int
 TEH_WIRE_init ()
 {
-  wire_methods = TEH_VALIDATION_get_wire_methods ("exchange-wire-incoming");
+  wire_methods = TEH_VALIDATION_get_wire_methods ();
   if ( (NULL == wire_methods) ||
        (0 == json_object_size (wire_methods)) )
   {
diff --git a/src/exchange/test-taler-exchange-aggregator-postgres.conf b/src/exchange/test-taler-exchange-aggregator-postgres.conf
index 00736e44d..f609c0afb 100644
--- a/src/exchange/test-taler-exchange-aggregator-postgres.conf
+++ b/src/exchange/test-taler-exchange-aggregator-postgres.conf
@@ -63,7 +63,6 @@ CLOSING-FEE-2025 = EUR:0.01
 CLOSING-FEE-2026 = EUR:0.01
 
 
-[exchange-wire-outgoing-test]
 # What is the main website of the bank?
 BANK_URI = "http://localhost:8082/"
 
diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf
index 5f282713b..2204f8d3c 100644
--- a/src/exchange/test_taler_exchange_httpd.conf
+++ b/src/exchange/test_taler_exchange_httpd.conf
@@ -36,7 +36,6 @@ DB_CONN_STR = "postgres:///talercheck"
 # Enable 'test' for testing of the actual coin operations.
 ENABLE = YES
 
-[exchange-wire-outgoing-test]
 # What is the main website of the bank?
 BANK_URI = "http://localhost:8082/"