Fix and Improve CRUD files

20 files changed, 59 insertions, 55 deletions

diff --git a/src/auditor/Makefile.am b/src/auditor/Makefile.am
index ec95946a9..664fb5a67 100644
--- a/src/auditor/Makefile.am
+++ b/src/auditor/Makefile.am
@@ -192,9 +192,9 @@ taler_auditor_httpd_SOURCES = \
     taler-auditor-httpd_bad-sig-losses-put.c taler-auditor-httpd_bad-sig-losses-put.h \
     taler-auditor-httpd_bad-sig-losses-get.c taler-auditor-httpd_bad-sig-losses-get.h \
     taler-auditor-httpd_bad-sig-losses-del.c taler-auditor-httpd_bad-sig-losses-del.h \
-    taler-auditor-httpd_auditor-closure-lags-put.c taler-auditor-httpd_auditor-closure-lags-put.h \
-    taler-auditor-httpd_auditor-closure-lags-get.c taler-auditor-httpd_auditor-closure-lags-get.h \
-    taler-auditor-httpd_auditor-closure-lags-del.c taler-auditor-httpd_auditor-closure-lags-del.h \
+    taler-auditor-httpd_closure-lags-put.c taler-auditor-httpd_closure-lags-put.h \
+    taler-auditor-httpd_closure-lags-get.c taler-auditor-httpd_closure-lags-get.h \
+    taler-auditor-httpd_closure-lags-del.c taler-auditor-httpd_closure-lags-del.h \
     taler-auditor-httpd_progress-put.c taler-auditor-httpd_progress-put.h \
     taler-auditor-httpd_progress-get.c taler-auditor-httpd_progress-get.h \
     taler-auditor-httpd_progress-del.c taler-auditor-httpd_progress-del.h \
diff --git a/src/auditor/taler-auditor-httpd_bad-sig-losses-get.c b/src/auditor/taler-auditor-httpd_bad-sig-losses-get.c
index eca1d92cf..bc0a9d47d 100644
--- a/src/auditor/taler-auditor-httpd_bad-sig-losses-get.c
+++ b/src/auditor/taler-auditor-httpd_bad-sig-losses-get.c
@@ -51,7 +51,7 @@ add_bad_sig_losses (void *cls,
     GNUNET_JSON_pack_string ("operation", dc->operation),
     TALER_JSON_pack_amount ("loss", &dc->loss),
     GNUNET_JSON_pack_data_auto ("operation_specific_pub",
-                                dc->operation_specific_pub),
+                                &dc->operation_specific_pub)
     );
   GNUNET_break (0 ==
                 json_array_append_new (list,
diff --git a/src/auditor/taler-auditor-httpd_bad-sig-losses-put.c b/src/auditor/taler-auditor-httpd_bad-sig-losses-put.c
index e43457e58..25b533bf7 100644
--- a/src/auditor/taler-auditor-httpd_bad-sig-losses-put.c
+++ b/src/auditor/taler-auditor-httpd_bad-sig-losses-put.c
@@ -90,10 +90,10 @@ TAH_BAD_SIG_LOSSES_PUT_handler (
 
     // TODO: fill in
 
-    GNUNET_JSON_spec_string ("operation", *dc->operation),
-    TALER_JSON_spec_amount ("loss", *dc->loss),
+    GNUNET_JSON_spec_string ("operation", (const char **) &dc.operation),
+    TALER_JSON_spec_amount ("loss", TAH_currency, &dc.loss),
     GNUNET_JSON_spec_fixed_auto ("operation_specific_pub",
-                                 *dc->operation_specific_pub),
+                                 &dc.operation_specific_pub),
 
 
     GNUNET_JSON_spec_end ()
diff --git a/src/auditor/taler-auditor-httpd_closure-lags-del.c b/src/auditor/taler-auditor-httpd_closure-lags-del.c
index bf9e169c7..456866f90 100644
--- a/src/auditor/taler-auditor-httpd_closure-lags-del.c
+++ b/src/auditor/taler-auditor-httpd_closure-lags-del.c
@@ -54,8 +54,8 @@ TAH_CLOSURE_LAGS_handler_delete (struct TAH_RequestHandler *rh,
 
 
   // execute the transaction
-  qs = TAH_plugin->delete_closure_lags (TAH_plugin->cls,
-                                        row_id);
+  qs = TAH_plugin->delete_auditor_closure_lags (TAH_plugin->cls,
+                                                row_id);
 
   if (0 > qs)
   {
diff --git a/src/auditor/taler-auditor-httpd_closure-lags-get.c b/src/auditor/taler-auditor-httpd_closure-lags-get.c
index 4f7233114..a41385406 100644
--- a/src/auditor/taler-auditor-httpd_closure-lags-get.c
+++ b/src/auditor/taler-auditor-httpd_closure-lags-get.c
@@ -35,11 +35,11 @@
 * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop iterating
 */
 static enum GNUNET_GenericReturnValue
-add_closure_lags (void *cls,
-                  uint64_t serial_id,
-                  const struct
-                  TALER_AUDITORDB_ClosureLags
-                  *dc)
+process_closure_lags (void *cls,
+                      uint64_t serial_id,
+                      const struct
+                      TALER_AUDITORDB_ClosureLags
+                      *dc)
 {
   json_t *list = cls;
   json_t *obj;
@@ -53,7 +53,7 @@ add_closure_lags (void *cls,
 
     TALER_JSON_pack_amount ("amount", &dc->amount),
     GNUNET_JSON_pack_int64 ("deadline", dc->deadline),
-    GNUNET_JSON_pack_string ("wtid", dc->wtid),
+    GNUNET_JSON_pack_int64 ("wtid", dc->wtid),
     GNUNET_JSON_pack_string ("account", dc->account)
 
     );
@@ -147,11 +147,11 @@ TAH_CLOSURE_LAGS_handler_get (struct TAH_RequestHandler *rh,
     }
   }
 
-  qs = TAH_plugin->get_closure_lags (
+  qs = TAH_plugin->get_auditor_closure_lags (
     TAH_plugin->cls,
     row_id,
     return_suppressed,
-    &add_closure_lags,
+    &process_closure_lags,
     ja);
 
   if (0 > qs)
diff --git a/src/auditor/taler-auditor-httpd_closure-lags-put.c b/src/auditor/taler-auditor-httpd_closure-lags-put.c
index aa28a2894..34491c470 100644
--- a/src/auditor/taler-auditor-httpd_closure-lags-put.c
+++ b/src/auditor/taler-auditor-httpd_closure-lags-put.c
@@ -54,8 +54,8 @@ process_inconsistency (
   }
 
   /* execute transaction */
-  qs = TAH_plugin->insert_closure_lags (TAH_plugin->cls,
-                                        dc);
+  qs = TAH_plugin->insert_auditor_closure_lags (TAH_plugin->cls,
+                                                dc);
   if (0 > qs)
   {
     GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
@@ -90,10 +90,10 @@ TAH_CLOSURE_LAGS_PUT_handler (
 
     // TODO: fill in
 
-    TALER_JSON_spec_amount ("amount", *dc->amount),
-    GNUNET_JSON_spec_int64 ("deadline", dc->deadline),
-    GNUNET_JSON_spec_string ("wtid", dc->wtid),
-    GNUNET_JSON_spec_string ("account", *dc->account),
+    TALER_JSON_spec_amount ("amount", TAH_currency, &dc.amount),
+    GNUNET_JSON_spec_int64 ("deadline", &dc.deadline),
+    GNUNET_JSON_spec_string ("wtid", (const char **) &dc.wtid),
+    GNUNET_JSON_spec_string ("account", (const char **) &dc.account),
 
 
     GNUNET_JSON_spec_end ()
diff --git a/src/auditor/taler-auditor-httpd_denomination-key-validity-withdraw-inconsistency-get.c b/src/auditor/taler-auditor-httpd_denomination-key-validity-withdraw-inconsistency-get.c
index 79bb80f12..545827888 100644
--- a/src/auditor/taler-auditor-httpd_denomination-key-validity-withdraw-inconsistency-get.c
+++ b/src/auditor/taler-auditor-httpd_denomination-key-validity-withdraw-inconsistency-get.c
@@ -49,7 +49,7 @@ process_denomination_key_validity_withdraw_inconsistency (void *cls,
 
     // TODO: fill in
 
-    GNUNET_JSON_pack_int64 ("execution_date", &dc->execution_date),
+    GNUNET_JSON_pack_int64 ("execution_date", dc->execution_date),
     GNUNET_JSON_pack_data_auto ("reserve_pub", &dc->reserve_pub),
     GNUNET_JSON_pack_data_auto ("execution_date", &dc->denompub_h)
 
diff --git a/src/auditor/taler-auditor-httpd_progress-get.c b/src/auditor/taler-auditor-httpd_progress-get.c
index d818264d2..c4abc9710 100644
--- a/src/auditor/taler-auditor-httpd_progress-get.c
+++ b/src/auditor/taler-auditor-httpd_progress-get.c
@@ -37,9 +37,7 @@
 static enum GNUNET_GenericReturnValue
 process_progress (void *cls,
                   uint64_t serial_id,
-                  const struct
-                  TALER_AUDITORDB_Progress
-                  *dc)
+                  const struct TALER_AUDITORDB_Progress *dc)
 {
   json_t *list = cls;
   json_t *obj;
@@ -49,7 +47,7 @@ process_progress (void *cls,
     // TODO: fill in
 
     GNUNET_JSON_pack_string ("progress_key", dc->progress_key),
-    GNUNET_JSON_pack_string ("progress_offset", dc->progress_offset)
+    GNUNET_JSON_pack_int64 ("progress_offset", dc->progress_offset)
 
     );
   GNUNET_break (0 ==
@@ -146,7 +144,7 @@ TAH_PROGRESS_handler_get (struct TAH_RequestHandler *rh,
     TAH_plugin->cls,
     row_id,
     return_suppressed,
-    &add_progress,
+    &process_progress,
     ja);
 
   if (0 > qs)
diff --git a/src/auditor/taler-auditor-httpd_progress-put.c b/src/auditor/taler-auditor-httpd_progress-put.c
index 3bc3968b8..083ae62cc 100644
--- a/src/auditor/taler-auditor-httpd_progress-put.c
+++ b/src/auditor/taler-auditor-httpd_progress-put.c
@@ -90,8 +90,9 @@ TAH_PROGRESS_PUT_handler (
 
     // TODO: fill in
 
-    GNUNET_JSON_spec_string ("progress_key", *dc->progress_key),
-    GNUNET_JSON_spec_string ("progress_offset", *dc->progress_offset),
+    GNUNET_JSON_spec_string ("progress_key", (const char **) &dc.progress_key),
+    GNUNET_JSON_spec_string ("progress_offset", (const
+                                                 char **) &dc.progress_offset),
 
 
     GNUNET_JSON_spec_end ()
diff --git a/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-get.c b/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-get.c
index a2c613711..3c434f8e4 100644
--- a/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-get.c
+++ b/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-get.c
@@ -51,9 +51,9 @@ process_purse_not_closed_inconsistencies (void *cls,
     // GNUNET_JSON_pack_... ("", &dc->),
 
 
-    GNUNET_JSON_pack_data_auto ("purse_pub", dc->purse_pub),
-    TALER_JSON_pack_amount ("amount", *dc->amount),
-    GNUNET_JSON_pack_int64 ("progress_offset", dc->expiration_date)
+    GNUNET_JSON_pack_data_auto ("purse_pub", &dc->purse_pub),
+    TALER_JSON_pack_amount ("amount", &dc->amount),
+    GNUNET_JSON_pack_int64 ("expiration_date", dc->expiration_date)
 
 
     );
diff --git a/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-put.c b/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-put.c
index 0b674f089..3dc750a82 100644
--- a/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-put.c
+++ b/src/auditor/taler-auditor-httpd_purse-not-closed-inconsistencies-put.c
@@ -93,9 +93,9 @@ TAH_PURSE_NOT_CLOSED_INCONSISTENCIES_PUT_handler (
     // GNUNET_JSON_spec_... ("", &dc.),
     // TALER_JSON_spec_... ("", TAH_currency, &dc.),
 
-    GNUNET_JSON_spec_fixed_auto ("purse_pub", dc->purse_pub),
-    TALER_JSON_spec_amount ("amount", *dc->amount),
-    GNUNET_JSON_spec_int64 ("progress_offset", dc->expiration_date),
+    GNUNET_JSON_spec_fixed_auto ("purse_pub", &dc.purse_pub),
+    TALER_JSON_spec_amount ("amount", TAH_currency, &dc.amount),
+    GNUNET_JSON_spec_int64 ("progress_offset", &dc.expiration_date),
 
 
     GNUNET_JSON_spec_end ()
diff --git a/src/auditor/taler-auditor-httpd_refreshes-hanging-get.c b/src/auditor/taler-auditor-httpd_refreshes-hanging-get.c
index d8549776d..2a7c8ae42 100644
--- a/src/auditor/taler-auditor-httpd_refreshes-hanging-get.c
+++ b/src/auditor/taler-auditor-httpd_refreshes-hanging-get.c
@@ -49,8 +49,8 @@ process_refreshes_hanging (void *cls,
     // TODO: fill in
 
 
-    TALER_JSON_pack_amount ("amount", *dc->amount),
-    GNUNET_JSON_pack_data_auto ("coin_pub", dc->coin_pub)
+    TALER_JSON_pack_amount ("amount", &dc->amount),
+    GNUNET_JSON_pack_data_auto ("coin_pub", &dc->coin_pub)
 
     );
   GNUNET_break (0 ==
@@ -147,7 +147,7 @@ TAH_REFRESHES_HANGING_handler_get (struct TAH_RequestHandler *rh,
     TAH_plugin->cls,
     row_id,
     return_suppressed,
-    &add_refreshes_hanging,
+    &process_refreshes_hanging,
     ja);
 
   if (0 > qs)
diff --git a/src/auditor/taler-auditor-httpd_refreshes-hanging-put.c b/src/auditor/taler-auditor-httpd_refreshes-hanging-put.c
index 779f4cab8..83e44524d 100644
--- a/src/auditor/taler-auditor-httpd_refreshes-hanging-put.c
+++ b/src/auditor/taler-auditor-httpd_refreshes-hanging-put.c
@@ -93,8 +93,8 @@ TAH_REFRESHES_HANGING_PUT_handler (
     // GNUNET_JSON_spec_... ("", &dc.),
     // TALER_JSON_spec_... ("", TAH_currency, &dc.),
 
-    TALER_JSON_spec_amount ("amount", *dc->amount),
-    GNUNET_JSON_spec_fixed_auto ("coin_pub", dc->coin_pub),
+    TALER_JSON_spec_amount ("amount", TAH_currency, &dc.amount),
+    GNUNET_JSON_spec_fixed_auto ("coin_pub", &dc.coin_pub),
 
     GNUNET_JSON_spec_end ()
   };
diff --git a/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-get.c b/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-get.c
index a6bcd5c3e..40ec4c9fe 100644
--- a/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-get.c
+++ b/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-get.c
@@ -52,7 +52,7 @@ process_reserve_balance_insufficient_inconsistency (void *cls,
     // TALER_JSON_pack_... ("", &dc->),
 
 
-    GNUNET_JSON_pack_data_auto ("reserve_pub", dc->reserve_pub),
+    GNUNET_JSON_pack_data_auto ("reserve_pub", &dc->reserve_pub),
     GNUNET_JSON_pack_bool ("inconsistency_gain", dc->inconsistency_gain),
     TALER_JSON_pack_amount ("inconsistency_amount", &dc->inconsistency_amount)
 
diff --git a/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-put.c b/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-put.c
index b1de95eb1..47d664b1a 100644
--- a/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-put.c
+++ b/src/auditor/taler-auditor-httpd_reserve-balance-insufficient-inconsistency-put.c
@@ -94,9 +94,10 @@ TAH_RESERVE_BALANCE_INSUFFICIENT_INCONSISTENCY_PUT_handler (
     // GNUNET_JSON_spec_... ("", &dc.),
     // TALER_JSON_spec_... ("", TAH_currency, &dc.),
 
-    GNUNET_JSON_spec_data_auto ("reserve_pub", dc->reserve_pub),
-    GNUNET_JSON_spec_bool ("inconsistency_gain", dc->inconsistency_gain),
-    TALER_JSON_spec_amount ("inconsistency_amount", *dc->inconsistency_amount),
+    GNUNET_JSON_spec_fixed_auto ("reserve_pub", &dc.reserve_pub),
+    GNUNET_JSON_spec_bool ("inconsistency_gain", &dc.inconsistency_gain),
+    TALER_JSON_spec_amount ("inconsistency_amount", TAH_currency,
+                            &dc.inconsistency_amount),
 
 
     GNUNET_JSON_spec_end ()
diff --git a/src/auditordb/Makefile.am b/src/auditordb/Makefile.am
index d70e71834..87501dd5d 100644
--- a/src/auditordb/Makefile.am
+++ b/src/auditordb/Makefile.am
@@ -122,11 +122,10 @@ pg_get_bad_sig_losses.c pg_get_bad_sig_losses.h \
 pg_del_auditor_closure_lags.c pg_del_auditor_closure_lags.h \
 pg_insert_auditor_closure_lags.c pg_insert_auditor_closure_lags.h \
 pg_get_auditor_closure_lags.c pg_get_auditor_closure_lags.h \
-pg_del_auditor_progress.c pg_del_auditor_progress.h \
-pg_get_auditor_progress.c pg_get_auditor_progress.h \
 pg_del_refreshes_hanging.c pg_del_refreshes_hanging.h \
 pg_insert_refreshes_hanging.c pg_insert_refreshes_hanging.h \
-pg_get_refreshes_hanging.c pg_get_refreshes_hanging.h
+pg_get_refreshes_hanging.c pg_get_refreshes_hanging.h \
+pg_del_auditor_progress.c pg_del_auditor_progress.h
 libtaler_plugin_auditordb_postgres_la_LDFLAGS = \
   $(TALER_PLUGIN_LDFLAGS)
 libtaler_plugin_auditordb_postgres_la_LIBADD = \
diff --git a/src/auditordb/pg_get_auditor_closure_lags.c b/src/auditordb/pg_get_auditor_closure_lags.c
index a1291fc51..6624ca378 100644
--- a/src/auditordb/pg_get_auditor_closure_lags.c
+++ b/src/auditordb/pg_get_auditor_closure_lags.c
@@ -94,7 +94,7 @@ closure_lags_cb (void *cls,
 
 
 enum GNUNET_DB_QueryStatus
-TAH_PG_get_closure_lags (
+TAH_PG_get_auditor_closure_lags (
   void *cls,
   uint64_t start_id,
   bool return_suppressed,             // maybe not needed
diff --git a/src/auditordb/pg_insert_purse_not_closed_inconsistencies.c b/src/auditordb/pg_insert_purse_not_closed_inconsistencies.c
index 9a82edb98..49eea8ffb 100644
--- a/src/auditordb/pg_insert_purse_not_closed_inconsistencies.c
+++ b/src/auditordb/pg_insert_purse_not_closed_inconsistencies.c
@@ -31,7 +31,7 @@ TAH_PG_insert_purse_not_closed_inconsistencies (
 
     GNUNET_PQ_query_param_auto_from_type (&dc->purse_pub),
     TALER_PQ_query_param_amount (pg->conn, &dc->amount),
-    GNUNET_PQ_query_param_int64 (dc->expiration_date),
+    GNUNET_PQ_query_param_int64 (&dc->expiration_date),
 
     GNUNET_PQ_query_param_end
   };
diff --git a/src/auditordb/plugin_auditordb_postgres.c b/src/auditordb/plugin_auditordb_postgres.c
index 9c2f8765a..5661610ff 100644
--- a/src/auditordb/plugin_auditordb_postgres.c
+++ b/src/auditordb/plugin_auditordb_postgres.c
@@ -82,9 +82,9 @@
 #include "pg_del_emergency.h"
 #include "pg_insert_emergency.h"
 
-#include "pg_get_auditor_progress.h"
+// #include "pg_get_auditor_progress.h"
 #include "pg_del_auditor_progress.h"
-#include "pg_insert_auditor_progress.h"
+// #include "pg_insert_auditor_progress.h"
 
 #include "pg_get_bad_sig_losses.h"
 #include "pg_del_bad_sig_losses.h"
@@ -618,6 +618,7 @@ libtaler_plugin_auditordb_postgres_init (void *cls)
   plugin->insert_emergency_by_count = &TAH_PG_insert_emergency_by_count;
   plugin->get_emergency_by_count = &TAH_PG_get_emergency_by_count;
 
+
   plugin->delete_denomination_key_validity_withdraw_inconsistency =
     &TAH_PG_del_denomination_key_validity_withdraw_inconsistency;
   plugin->insert_denomination_key_validity_withdraw_inconsistency =
@@ -632,6 +633,7 @@ libtaler_plugin_auditordb_postgres_init (void *cls)
   plugin->get_purse_not_closed_inconsistencies =
     &TAH_PG_get_purse_not_closed_inconsistencies;
 
+
   plugin->delete_reserve_balance_insufficient_inconsistency =
     &TAH_PG_del_reserve_balance_insufficient_inconsistency;
   plugin->insert_reserve_balance_insufficient_inconsistency =
@@ -643,12 +645,15 @@ libtaler_plugin_auditordb_postgres_init (void *cls)
   plugin->insert_bad_sig_losses = &TAH_PG_insert_bad_sig_losses;
   plugin->get_bad_sig_losses = &TAH_PG_get_bad_sig_losses;
 
+
   plugin->delete_auditor_closure_lags = &TAH_PG_del_auditor_closure_lags;
   plugin->insert_auditor_closure_lags = &TAH_PG_insert_auditor_closure_lags;
   plugin->get_auditor_closure_lags = &TAH_PG_get_auditor_closure_lags;
 
+
   plugin->delete_progress = &TAH_PG_del_progress;
 
+
   plugin->delete_refreshes_hanging = &TAH_PG_del_refreshes_hanging;
   plugin->insert_refreshes_hanging = &TAH_PG_insert_refreshes_hanging;
   plugin->get_refreshes_hanging = &TAH_PG_get_refreshes_hanging;
diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h
index e6d431c05..4dc3a2531 100644
--- a/src/include/taler_auditordb_plugin.h
+++ b/src/include/taler_auditordb_plugin.h
@@ -292,7 +292,7 @@ struct TALER_AUDITORDB_Progress
 {
   unsigned int row_id;
   char *progress_key;
-  char progress_offset;
+  int64_t progress_offset;
 };
 
 /**
@@ -1084,7 +1084,7 @@ struct TALER_AUDITORDB_Plugin
     void *cls,
     uint64_t start_id,
     bool return_suppressed,
-    TALER_AUDITORDB_EmergencyCallback cb,
+    TALER_AUDITORDB_ProgressCallback cb,
     void *cb_cls);
 
   enum GNUNET_DB_QueryStatus