update man pages and templates to use current options

6 files changed, 55 insertions, 32 deletions

diff --git a/contrib/exchange-template/config/exchange-common.conf b/contrib/exchange-template/config/exchange-common.conf
index 26bf4ff94..eddde3c32 100644
--- a/contrib/exchange-template/config/exchange-common.conf
+++ b/contrib/exchange-template/config/exchange-common.conf
@@ -21,15 +21,23 @@ TESTRUN = YES
 [exchangedb-postgres]
 DB_CONN_STR = "postgres:///talercheck"
 
-[wire-sepa]
+[wire-incoming-sepa]
 SEPA_RESPONSE_FILE = "sepa.json"
 
-[wire-test]
+[wire-outgoing-sepa]
+SEPA_RESPONSE_FILE = "sepa.json"
+
+
+[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_NO_INCOMING = 2
+BANK_ACCOUNT_NUMBER = 2
+
+[wire-outgoing-test]
+# What is the main website of the bank?
+BANK_URI = "https://bank/"
 # From which account at the 'bank' should outgoing
 # wire transfers be made?
-BANK_ACCOUNT_NO_OUTGOING = 2
+BANK_ACCOUNT_NUMBER = 2
diff --git a/doc/taler.conf.5 b/doc/taler.conf.5
index f9d9d6312..e4c7083d6 100644
--- a/doc/taler.conf.5
+++ b/doc/taler.conf.5
@@ -28,20 +28,23 @@ The following options are from the "[exchange]" section and used by most exchang
 
 .SH WIRE transfer details
 
-The following options must be in section "[exchange-wire-test]":
+The following options must be in section "[wire\-incoming\-test]" and "[wire\-outgoing\-test]":
 
-.IP REDIRECT_URL
-    URL to redirect /wire/test to. Should contain a Web form the user can use to charge his wallet with coins in a "test" currency for testing. If this option is not provided, /wire/test will return "501 NOT IMPLEMENTED".
+.IP BANK_URI
+    URL of the Taler bank.
 
-The following options must be in section "[exchange-wire-sepa]":
+.IP BANK_ACCOUNT_NUMBER
+    Number of the bank account of the exchange.
+
+The following options must be in section "[wire\-incoming\-sepa]" and "[wire\-outgoing\-sepa]":
 
 .IP SEPA_RESPONSE_FILE
-    Filename with the JSON body for the /wire/sepa response, signed using the exchange's long-term offline master key.  If this option is not provided, /wire/test will return "501 NOT IMPLEMENTED".  Use "taler-exchange-sepa" to create the SEPA_RESPONSE_FILE.
+    Filename with the JSON body for the /wire response, signed using the exchange\'s long-term offline master key.  Use taler\-exchange\-sepa to create the SEPA_RESPONSE_FILE.
 
 
 .SH Postgres database options
 
-The following options must be in section "[exchangedb-postgres]":
+The following options must be in section "[exchangedb\-postgres]":
 
 .IP DB_CONN_STR
     How to access the database, i.e. "postgres:///taler" to use the "taler" database. Testcases use "talercheck".
@@ -86,4 +89,3 @@ Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic
 
 .SH "SEE ALSO"
 \fBtaler\-exchange\-httpd\fP(1), \fBtaler\-exchange\-keyup\fP(1), \fBtaler\-exchange\-reservemod\fP(1), \fBtaler\-exchange\-dbinit\fP(1), \fBtaler\-exchange\-sepa(1)
-
diff --git a/src/exchange-lib/test-exchange-home/config/exchange-common.conf b/src/exchange-lib/test-exchange-home/config/exchange-common.conf
index 89b7f5182..97947f111 100644
--- a/src/exchange-lib/test-exchange-home/config/exchange-common.conf
+++ b/src/exchange-lib/test-exchange-home/config/exchange-common.conf
@@ -22,15 +22,20 @@ TESTRUN = YES
 [exchangedb-postgres]
 DB_CONN_STR = "postgres:///talercheck"
 
-[wire-sepa]
+[wire-incoming-sepa]
 SEPA_RESPONSE_FILE = "test-exchange-home/sepa.json"
 
-[wire-test]
+[wire-incoming-sepa]
+SEPA_RESPONSE_FILE = "test-exchange-home/sepa.json"
+
+[wire-incoming-test]
+# What is the main website of the bank?
+BANK_URI = "http://localhost/"
+# Into which account at the 'bank' should (incoming) wire transfers be made?
+BANK_ACCOUNT_NUMBER = 2
+
+[wire-outgoing-test]
 # What is the main website of the bank?
 BANK_URI = "http://localhost/"
-# Into which account at the 'bank' should incoming
-# wire transfers be made?
-BANK_ACCOUNT_NO_INCOMING = 2
-# From which account at the 'bank' should outgoing
-# wire transfers be made?
-BANK_ACCOUNT_NO_OUTGOING = 2
\ No newline at end of file
+# Into which account at the 'bank' should (incoming) wire transfers be made?
+BANK_ACCOUNT_NUMBER = 2
diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c
index 6eae08f4d..bfe54d507 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -1227,6 +1227,7 @@ wire_cb (void *cls,
   struct InterpreterState *is = cls;
   struct Command *cmd = &is->commands[is->ip];
 
+  cmd->details.wire.wh = NULL;
   if (cmd->expected_response_code != http_status)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/exchange/test-exchange-home/config/exchange-common.conf b/src/exchange/test-exchange-home/config/exchange-common.conf
index e4ff2a4d6..4078cbee5 100644
--- a/src/exchange/test-exchange-home/config/exchange-common.conf
+++ b/src/exchange/test-exchange-home/config/exchange-common.conf
@@ -22,12 +22,18 @@ TESTRUN = YES
 [exchangedb-postgres]
 DB_CONN_STR = "postgres:///talercheck"
 
-[wire-test]
+
+[wire-incoming-test]
 # What is the main website of the bank?
 BANK_URI = "http://localhost:8082/"
 # Into which account at the 'bank' should incoming
 # wire transfers be made?
-BANK_ACCOUNT_NO_INCOMING = 2
+BANK_ACCOUNT_NUMBER = 2
+
+[wire-outgoing-test]
+# What is the main website of the bank?
+BANK_URI = "http://localhost:8082/"
+
 # From which account at the 'bank' should outgoing
 # wire transfers be made?
-BANK_ACCOUNT_NO_OUTGOING = 3
+BANK_ACCOUNT_NUMBER = 3
diff --git a/src/wire/plugin_wire_test.c b/src/wire/plugin_wire_test.c
index a03f8127d..888501afb 100644
--- a/src/wire/plugin_wire_test.c
+++ b/src/wire/plugin_wire_test.c
@@ -44,9 +44,10 @@ struct TestClosure
   char *currency;
 
   /**
-   * Number of the account that the exchange has at the bank.
+   * Number of the account that the exchange has at the bank for outgoing
+   * transfers.
    */
-  unsigned long long exchange_account_no;
+  unsigned long long exchange_account_outgoing_no;
 
   /**
    * Handle to the bank task, or NULL.
@@ -576,7 +577,7 @@ test_execute_wire_transfer (void *cls,
   eh->aaih = TALER_BANK_admin_add_incoming (tc->bank,
                                             &bf.wtid,
                                             &amount,
-                                            (uint64_t) tc->exchange_account_no,
+                                            (uint64_t) tc->exchange_account_outgoing_no,
 					    (uint64_t) account_no,
                                             &execute_cb,
                                             eh);
@@ -632,25 +633,25 @@ libtaler_plugin_wire_test_init (void *cls)
   {
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_string (cfg,
-                                               "wire-test",
+                                               "wire-outgoing-test",
                                                "BANK_URI",
                                                &uri))
     {
       GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "wire-test",
+                                 "wire-outgoing-test",
                                  "BANK_URI");
       GNUNET_free (tc);
       return NULL;
     }
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_number (cfg,
-                                               "wire-test",
-                                               "BANK_ACCOUNT_NO_OUTGOING",
-                                               &tc->exchange_account_no))
+                                               "wire-outgoing-test",
+                                               "BANK_ACCOUNT_NUMBER",
+                                               &tc->exchange_account_outgoing_no))
     {
       GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "wire-test",
-                                 "BANK_ACCOUNT_NO_OUTGOING");
+                                 "wire-incoming-test",
+                                 "BANK_ACCOUNT_NUMBER");
       GNUNET_free (uri);
       GNUNET_free (tc);
       return NULL;