fix #7190: handle new wad fees properly in merchant

1 files changed, 4 insertions, 10 deletions

diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index fcd62fb3..adbea0a9 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -1867,9 +1867,7 @@ struct TALER_MERCHANTDB_Plugin
    * @param master_pub master public key of the exchange
    * @param h_wire_method hash of wire method
    * @param contract_date date of the contract to use for the lookup
-   * @param[out] wire_fee wire fee charged
-   * @param[out] closing_fee closing fee charged (irrelevant for us,
-   *              but needed to check signature)
+   * @param[out] fees set to wire fees charged
    * @param[out] start_date start of fee being used
    * @param[out] end_date end of fee being used
    * @param[out] master_sig signature of exchange over fee structure
@@ -1880,8 +1878,7 @@ struct TALER_MERCHANTDB_Plugin
                      const struct TALER_MasterPublicKeyP *master_pub,
                      const char *wire_method,
                      struct GNUNET_TIME_Timestamp contract_date,
-                     struct TALER_Amount *wire_fee,
-                     struct TALER_Amount *closing_fee,
+                     struct TALER_WireFeeSet *fees,
                      struct GNUNET_TIME_Timestamp *start_date,
                      struct GNUNET_TIME_Timestamp *end_date,
                      struct TALER_MasterSignatureP *master_sig);
@@ -2036,9 +2033,7 @@ struct TALER_MERCHANTDB_Plugin
    * @param cls closure
    * @param exchange_pub public key of the exchange
    * @param h_wire_method hash of wire method
-   * @param wire_fee wire fee charged
-   * @param closing_fee closing fee charged (irrelevant for us,
-   *              but needed to check signature)
+   * @param fees wire fees charged
    * @param start_date start of fee being used
    * @param end_date end of fee being used
    * @param exchange_sig signature of exchange over fee structure
@@ -2049,8 +2044,7 @@ struct TALER_MERCHANTDB_Plugin
     void *cls,
     const struct TALER_MasterPublicKeyP *exchange_pub,
     const struct GNUNET_HashCode *h_wire_method,
-    const struct TALER_Amount *wire_fee,
-    const struct TALER_Amount *closing_fee,
+    const struct TALER_WireFeeSet *fees,
     struct GNUNET_TIME_Timestamp start_date,
     struct GNUNET_TIME_Timestamp end_date,
     const struct TALER_MasterSignatureP *exchange_sig);