enable multiple wire methods to be used with aggregator, add command to run aggregator in testcase

2 files changed, 4 insertions, 4 deletions

diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index ebcfe3757..8e00be751 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -684,12 +684,14 @@ typedef void
  *
  * @param cls closure
  * @param rowid row identifier used to mark prepared transaction as done
+ * @param wire_method which wire method is this preparation data for
  * @param buf transaction data that was persisted, NULL on error
  * @param buf_size number of bytes in @a buf, 0 on error
  */
 typedef void
 (*TALER_EXCHANGEDB_WirePreparationCallback) (void *cls,
                                              unsigned long long rowid,
+                                             const char *wire_method,
                                              const char *buf,
                                              size_t buf_size);
 
@@ -1479,7 +1481,6 @@ struct TALER_EXCHANGEDB_Plugin
    *
    * @param cls closure
    * @param session database connection
-   * @param type type fo the wire transfer (i.e. "sepa")
    * @param cb function to call for ONE unfinished item
    * @param cb_cls closure for @a cb
    * @return #GNUNET_OK on success,
@@ -1489,7 +1490,6 @@ struct TALER_EXCHANGEDB_Plugin
   int
   (*wire_prepare_data_get)(void *cls,
                            struct TALER_EXCHANGEDB_Session *session,
-                           const char *type,
                            TALER_EXCHANGEDB_WirePreparationCallback cb,
                            void *cb_cls);
 
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 4ce57b0f8..e338916e1 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -418,7 +418,7 @@ struct TALER_RefundRequestPS
 
   /**
    * The coin's public key.  This is the value that must have been
-   * signed (blindly) by the Exchange.  
+   * signed (blindly) by the Exchange.
    */
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
@@ -912,7 +912,7 @@ struct TALER_DepositTrackPS
 
 /**
  * @brief Format internally used for packing the detailed information
- * to generate the signature for /wire/deposit signatures.
+ * to generate the signature for /wire/deposits signatures.
  */
 struct TALER_WireDepositDetailP
 {