1 files changed, 29 insertions, 28 deletions

diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h
index 31923db6b..9fd1da42d 100644
--- a/src/include/taler_auditordb_plugin.h
+++ b/src/include/taler_auditordb_plugin.h
@@ -213,7 +213,7 @@ struct TALER_AUDITORDB_Generic_Update
 struct TALER_AUDITORDB_AmountArithmeticInconsistency
 {
   unsigned int row_id;
-  char*operation;
+  char *operation;
   struct TALER_Amount exchange_amount;
   struct TALER_Amount auditor_amount;
   bool profitable;
@@ -225,10 +225,10 @@ struct TALER_AUDITORDB_AmountArithmeticInconsistency
 struct TALER_AUDITORDB_CoinInconsistency
 {
   unsigned int row_id;
-  char*operation;   // TODO: change to string
+  char *operation;  // TODO: change to string
   struct TALER_Amount exchange_amount;
   struct TALER_Amount auditor_amount;
-  struct TALER_CoinSpendPublicKeyP coin_pub;
+  struct GNUNET_CRYPTO_EddsaPublicKey coin_pub;
   bool profitable;
 };
 
@@ -250,7 +250,7 @@ struct TALER_AUDITORDB_BadSigLosses
   unsigned int row_id;
   char *operation;
   struct TALER_Amount loss;
-  struct TALER_CoinSpendPublicKeyP operation_specific_pub;
+  struct GNUNET_CRYPTO_EddsaPublicKey operation_specific_pub;
 };
 
 /**
@@ -275,8 +275,8 @@ struct TALER_AUDITORDB_Emergency
   struct TALER_DenominationHashP denompub_h;
   struct TALER_Amount denom_risk;
   struct TALER_Amount denom_loss;
-  int64_t deposit_start;
-  int64_t deposit_end;
+  struct GNUNET_TIME_Absolute deposit_start;
+  struct GNUNET_TIME_Absolute deposit_end;
   struct TALER_Amount value;
 };
 
@@ -290,8 +290,8 @@ struct TALER_AUDITORDB_EmergenciesByCount
   int64_t num_issued;
   int64_t num_known;
   struct TALER_Amount risk;
-  int64_t start;
-  int64_t deposit_end;
+  struct GNUNET_TIME_Absolute start;
+  struct GNUNET_TIME_Absolute deposit_end;
   struct TALER_Amount value;
 };
 
@@ -312,7 +312,7 @@ struct TALER_AUDITORDB_RefreshesHanging
 {
   unsigned int row_id;
   struct TALER_Amount amount;
-  struct TALER_CoinSpendPublicKeyP coin_pub;
+  struct GNUNET_CRYPTO_EddsaPublicKey coin_pub;
 };
 
 /**
@@ -322,7 +322,7 @@ struct TALER_AUDITORDB_FeeTimeInconsistency
 {
   unsigned int row_id;
   char *type;
-  int64_t time;
+  struct GNUNET_TIME_Absolute time;
   char *diagnostic;
 };
 
@@ -332,7 +332,7 @@ struct TALER_AUDITORDB_FeeTimeInconsistency
 struct TALER_AUDITORDB_DenominationKeyValidityWithdrawInconsistency
 {
   unsigned int row_id;
-  int64_t execution_date;
+  struct GNUNET_TIME_Absolute execution_date;
   struct TALER_ReservePublicKeyP reserve_pub;
   struct TALER_DenominationHashP denompub_h;
 };
@@ -343,9 +343,9 @@ struct TALER_AUDITORDB_DenominationKeyValidityWithdrawInconsistency
 struct TALER_AUDITORDB_PurseNotClosedInconsistencies
 {
   unsigned int row_id;
-  struct TALER_PurseContractPublicKeyP purse_pub;
+  struct GNUNET_CRYPTO_EddsaPublicKey purse_pub;
   struct TALER_Amount amount;
-  int64_t expiration_date;
+  struct GNUNET_TIME_Absolute expiration_date;
 };
 
 /**
@@ -354,7 +354,7 @@ struct TALER_AUDITORDB_PurseNotClosedInconsistencies
 struct TALER_AUDITORDB_ReserveBalanceInsufficientInconsistency
 {
   unsigned int row_id;
-  struct TALER_ReservePublicKeyP reserve_pub;
+  struct GNUNET_CRYPTO_EddsaPublicKey reserve_pub;
   bool inconsistency_gain;
   struct TALER_Amount inconsistency_amount;
 };
@@ -651,8 +651,8 @@ struct TALER_AUDITORDB_DenominationsWithoutSigs
   unsigned int row_id;
   struct TALER_DenominationHashP denompub_h;
   struct TALER_Amount value;
-  int64_t start_time;
-  int64_t end_time;
+  struct GNUNET_TIME_Absolute start_time;
+  struct GNUNET_TIME_Absolute end_time;
   bool suppressed;
 
 };
@@ -727,6 +727,7 @@ struct TALER_AUDITORDB_HistoricReserveSummary
   int64_t start_date;
   int64_t end_date;
   struct TALER_Amount reserve_profits;
+  bool suppressed;
 
 };
 
@@ -786,7 +787,7 @@ struct TALER_AUDITORDB_ReserveNotClosedInconsistency
   unsigned int row_id;
   struct TALER_ReservePublicKeyP reserve_pub;
   struct TALER_Amount balance;
-  int64_t expiration_time;
+  struct GNUNET_TIME_Absolute expiration_time;
   char *diagnostic;
   bool suppressed;
 
@@ -819,7 +820,7 @@ typedef enum GNUNET_GenericReturnValue
  * @param deadline what was the earliest requested wire transfer deadline
  */
 typedef void
-(*TALER_AUDITORDB_WireMissingCallback)(
+(*TALER_AUDITORDB_WireMissingCallback) (
   void *cls,
   uint64_t batch_deposit_serial_id,
   const struct TALER_Amount *total_amount,
@@ -976,11 +977,11 @@ struct TALER_AUDITORDB_Plugin
    * @return handle useful to cancel the listener
    */
   struct GNUNET_DB_EventHandler *
-  (*event_listen)(void *cls,
-                  const struct GNUNET_DB_EventHeaderP *es,
-                  struct GNUNET_TIME_Relative timeout,
-                  GNUNET_DB_EventCallback cb,
-                  void *cb_cls);
+  (*event_listen) (void *cls,
+                   const struct GNUNET_DB_EventHeaderP *es,
+                   struct GNUNET_TIME_Relative timeout,
+                   GNUNET_DB_EventCallback cb,
+                   void *cb_cls);
 
   /**
    * Stop notifications.
@@ -988,7 +989,7 @@ struct TALER_AUDITORDB_Plugin
    * @param eh handle to unregister.
    */
   void
-  (*event_listen_cancel)(struct GNUNET_DB_EventHandler *eh);
+  (*event_listen_cancel) (struct GNUNET_DB_EventHandler *eh);
 
 
   /**
@@ -1000,10 +1001,10 @@ struct TALER_AUDITORDB_Plugin
    * @param extra_size number of bytes in @a extra
    */
   void
-  (*event_notify)(void *cls,
-                  const struct GNUNET_DB_EventHeaderP *es,
-                  const void *extra,
-                  size_t extra_size);
+  (*event_notify) (void *cls,
+                   const struct GNUNET_DB_EventHeaderP *es,
+                   const void *extra,
+                   size_t extra_size);
 
 
   /**