add currency to amounts in merchant DB

1 files changed, 7 insertions, 24 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index d427dc22..c41080be 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -559,9 +559,7 @@ struct TALER_MERCHANT_AccountConfig
  * @param ut user type of the merchant instance
  * @param address physical address of the merchant instance
  * @param jurisdiction jurisdiction of the merchant instance
- * @param default_max_wire_fee default maximum wire fee merchant is willing to fully pay
- * @param default_wire_fee_amortization default amortization factor for excess wire fees
- * @param default_max_deposit_fee default maximum deposit fee merchant is willing to pay
+ * @param use_stefan use STEFAN curve for acceptable fees
  * @param default_wire_transfer_delay default wire transfer delay merchant will ask for
  * @param default_pay_delay default validity period for offers merchant makes
  * @param auth_token authentication token to use for access control, NULL for external auth; MUST follow RFC 8959
@@ -581,9 +579,7 @@ TALER_MERCHANT_instances_post (
   enum TALER_KYCLOGIC_KycUserType ut,
   const json_t *address,
   const json_t *jurisdiction,
-  const struct TALER_Amount *default_max_wire_fee,
-  uint32_t default_wire_fee_amortization,
-  const struct TALER_Amount *default_max_deposit_fee,
+  bool use_stefan,
   struct GNUNET_TIME_Relative default_wire_transfer_delay,
   struct GNUNET_TIME_Relative default_pay_delay,
   const char *auth_token,
@@ -754,9 +750,7 @@ typedef void
  * @param ut user type of the merchant instance
  * @param address physical address of the merchant instance
  * @param jurisdiction jurisdiction of the merchant instance
- * @param default_max_wire_fee default maximum wire fee merchant is willing to fully pay
- * @param default_wire_fee_amortization default amortization factor for excess wire fees
- * @param default_max_deposit_fee default maximum deposit fee merchant is willing to pay
+ * @param use_stefan use STEFAN curve for acceptable fees
  * @param default_wire_transfer_delay default wire transfer delay merchant will ask for
  * @param default_pay_delay default validity period for offers merchant makes
  * @param cb function to call with the
@@ -775,9 +769,7 @@ TALER_MERCHANT_instance_patch (
   enum TALER_KYCLOGIC_KycUserType ut,
   const json_t *address,
   const json_t *jurisdiction,
-  const struct TALER_Amount *default_max_wire_fee,
-  uint32_t default_wire_fee_amortization,
-  const struct TALER_Amount *default_max_deposit_fee,
+  bool use_stefan,
   struct GNUNET_TIME_Relative default_wire_transfer_delay,
   struct GNUNET_TIME_Relative default_pay_delay,
   TALER_MERCHANT_InstancePatchCallback cb,
@@ -914,14 +906,10 @@ struct TALER_MERCHANT_InstanceDetails
   const json_t *jurisdiction;
 
   /**
-   * default maximum wire fee merchant is willing to fully pay
+   * Are we using STEFAN curves to determine acceptable
+   * fees?
    */
-  struct TALER_Amount default_max_wire_fee;
-
-  /**
-   * default maximum deposit fee merchant is willing to pay
-   */
-  struct TALER_Amount default_max_deposit_fee;
+  bool use_stefan;
 
   /**
    * default wire transfer delay merchant will ask for
@@ -934,11 +922,6 @@ struct TALER_MERCHANT_InstanceDetails
   struct GNUNET_TIME_Relative default_pay_delay;
 
   /**
-   * Default amortization factor for excess wire fees
-   */
-  uint32_t default_wire_fee_amortization;
-
-  /**
    * User type for the instance.
    */
   enum TALER_KYCLOGIC_KycUserType ut;