summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Blättler <blatc2@bfh.ch>2023-11-20 08:00:43 +0100
committerChristian Grothoff <grothoff@gnunet.org>2023-12-23 00:08:56 +0800
commit20632c6a2e293a9799114497d63180a105b37065 (patch)
tree27731152b103fdcb76e0316e025abf4519533d1e
parentf13c141f1d3f9a167f0fff32d3166db92f1ccbab (diff)
downloadmerchant-20632c6a2e293a9799114497d63180a105b37065.tar.gz
merchant-20632c6a2e293a9799114497d63180a105b37065.tar.bz2
merchant-20632c6a2e293a9799114497d63180a105b37065.zip
db plugin: better naming for validity
-rw-r--r--src/include/taler_merchantdb_plugin.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 66955ce5..631cdcd5 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -1096,6 +1096,11 @@ enum TALER_MERCHANTDB_TokenFamilyKind
struct TALER_MERCHANTDB_TokenFamilyDetails
{
/**
+ * Token family slug used for identification.
+ */
+ char* slug;
+
+ /**
* User readable name of the token family.
*/
char* name;
@@ -1123,14 +1128,13 @@ struct TALER_MERCHANTDB_TokenFamilyDetails
/**
* Counter for each issued token of this family.
*/
- */
uint64_t issued;
/**
* Counter for each redeemed token of this family.
*/
uint64_t redeemed;
-}
+};
/**
@@ -1141,17 +1145,17 @@ struct TALER_MERCHANTDB_TokenFamilyKeyDetails
/**
* Tokens signed with this key are valid from this date on.
*/
- struct GNUNET_TIME_Timestamp start_date;
+ struct GNUNET_TIME_Timestamp valid_after;
/**
* Tokens signed with this key are valid until this date.
*/
- struct GNUNET_TIME_Timestamp expiration_date;
+ struct GNUNET_TIME_Timestamp valid_before;
/**
* Token family public key.
*/
- union TALER_TokenFamilyPublicKey pub;
+ struct TALER_TokenFamilyPublicKey pub;
/**
* Hash of the token family public key.
@@ -1161,13 +1165,13 @@ struct TALER_MERCHANTDB_TokenFamilyKeyDetails
/**
* Token family private key.
*/
- union TALER_TokenFamilyPrivateKey priv;
+ struct TALER_TokenFamilyPrivateKey priv;
/**
* Token family key cipher.
*/
- enum TALER_MERCHANTDB_TokenKeyCipher cipher;
-}
+ // enum TALER_MERCHANTDB_TokenKeyCipher cipher;
+};
/**
* Details about a spent token.
@@ -1188,7 +1192,7 @@ struct TALER_MERCHANTDB_SpentTokenDetails
* Blind signature for the spent token to prove validity of it.
*/
struct TALER_TokenBlindSignature blind_sig;
-}
+};
/**