add rounding and remove h_issue

3 files changed, 8 insertions, 5 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index dc79303f..52034f63 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -2069,6 +2069,7 @@ typedef void
  * @param valid_after when the token family becomes valid
  * @param valid_before when the token family expires
  * @param duration how long tokens issued by this token family are valid for
+ * @param rounding rounding duration of token family
  * @param kind kind of token family, "subscription" or "discount"
  * @param cb function to call with the backend's result
  * @param cb_cls closure for @a cb
@@ -2085,6 +2086,7 @@ TALER_MERCHANT_token_families_post (
   struct GNUNET_TIME_Timestamp valid_after,
   struct GNUNET_TIME_Timestamp valid_before,
   struct GNUNET_TIME_Relative duration,
+  struct GNUNET_TIME_Relative rounding,
   const char *kind,
   TALER_MERCHANT_TokenFamiliesPostCallback cb,
   void *cb_cls);
@@ -3352,11 +3354,6 @@ struct TALER_MERCHANT_OutputToken
   struct TALER_TokenEnvelopeP envelope;
 
   /**
-   * Hash of the corresponding token issue public key.
-   */
-  struct TALER_TokenIssuePublicKeyHashP h_issue;
-
-  /**
    * Blinded issue signature made by the merchant.
    */
   struct TALER_TokenIssueBlindSignatureP blinded_sig;
diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h
index 20ac3076..d4b5bd27 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -1572,6 +1572,7 @@ TALER_TESTING_cmd_merchant_post_tokenfamilies (
   struct GNUNET_TIME_Timestamp valid_after,
   struct GNUNET_TIME_Timestamp valid_before,
   struct GNUNET_TIME_Relative duration,
+  struct GNUNET_TIME_Relative rounding,
   const char *kind);
 
 /* ****** Webhooks ******* */
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index f63fcd99..e7f3090a 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -1148,6 +1148,11 @@ struct TALER_MERCHANTDB_TokenFamilyDetails
   struct GNUNET_TIME_Relative duration;
 
   /**
+   * Rounding duration of the token family.
+   */
+  struct GNUNET_TIME_Relative rounding;
+
+  /**
    * Token family kind.
    */
   enum TALER_MERCHANTDB_TokenFamilyKind kind;