working through auditors

15 files changed, 19 insertions, 19 deletions

diff --git a/src/auditordb/pg_delete_wire_out_inconsistency_if_matching.c b/src/auditordb/pg_delete_wire_out_inconsistency_if_matching.c
index 3e959bf5d..b0390b426 100644
--- a/src/auditordb/pg_delete_wire_out_inconsistency_if_matching.c
+++ b/src/auditordb/pg_delete_wire_out_inconsistency_if_matching.c
@@ -26,7 +26,7 @@ TAH_PG_delete_wire_out_inconsistency_if_matching (
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (dc->destination_account),
+    GNUNET_PQ_query_param_string (dc->destination_account.full_payto),
     GNUNET_PQ_query_param_string (dc->diagnostic),
     GNUNET_PQ_query_param_uint64 (&dc->wire_out_row_id),
     TALER_PQ_query_param_amount (pg->conn,
diff --git a/src/auditordb/pg_get_auditor_closure_lags.c b/src/auditordb/pg_get_auditor_closure_lags.c
index de2b98dd6..e81367ed0 100644
--- a/src/auditordb/pg_get_auditor_closure_lags.c
+++ b/src/auditordb/pg_get_auditor_closure_lags.c
@@ -78,7 +78,7 @@ closure_lags_cb (void *cls,
       GNUNET_PQ_result_spec_auto_from_type ("wtid",
                                             &dc.wtid),
       GNUNET_PQ_result_spec_string ("account",
-                                    &dc.account),
+                                    &dc.account.full_payto),
       GNUNET_PQ_result_spec_bool ("suppressed",
                                   &dc.suppressed),
       GNUNET_PQ_result_spec_end
diff --git a/src/auditordb/pg_get_reserve_in_inconsistency.c b/src/auditordb/pg_get_reserve_in_inconsistency.c
index b3abc8799..0d9562733 100644
--- a/src/auditordb/pg_get_reserve_in_inconsistency.c
+++ b/src/auditordb/pg_get_reserve_in_inconsistency.c
@@ -81,7 +81,7 @@ reserve_in_inconsistency_cb (void *cls,
       GNUNET_PQ_result_spec_absolute_time ("timestamp",
                                            &dc.timestamp),
       GNUNET_PQ_result_spec_string ("account",
-                                    &dc.account),
+                                    &dc.account.full_payto),
       GNUNET_PQ_result_spec_string ("diagnostic",
                                     &dc.diagnostic),
       GNUNET_PQ_result_spec_bool ("suppressed",
diff --git a/src/auditordb/pg_get_reserve_info.c b/src/auditordb/pg_get_reserve_info.c
index f16c6d995..2dac3f76b 100644
--- a/src/auditordb/pg_get_reserve_info.c
+++ b/src/auditordb/pg_get_reserve_info.c
@@ -32,7 +32,7 @@ TAH_PG_get_reserve_info (void *cls,
                          uint64_t *rowid,
                          struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
                          struct GNUNET_TIME_Timestamp *expiration_date,
-                         char **sender_account)
+                         struct TALER_FullPayto *sender_account)
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_QueryParam params[] = {
@@ -60,12 +60,12 @@ TAH_PG_get_reserve_info (void *cls,
                                   rowid),
     GNUNET_PQ_result_spec_allow_null (
       GNUNET_PQ_result_spec_string ("origin_account",
-                                    sender_account),
+                                    &sender_account->full_payto),
       NULL),
     GNUNET_PQ_result_spec_end
   };
 
-  *sender_account = NULL;
+  sender_account->full_payto = NULL;
   PREPARE (pg,
            "auditor_get_reserve_info",
            "SELECT"
diff --git a/src/auditordb/pg_get_reserve_info.h b/src/auditordb/pg_get_reserve_info.h
index 3eba035fc..5e3fa6281 100644
--- a/src/auditordb/pg_get_reserve_info.h
+++ b/src/auditordb/pg_get_reserve_info.h
@@ -43,7 +43,7 @@ TAH_PG_get_reserve_info (void *cls,
                          uint64_t *rowid,
                          struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
                          struct GNUNET_TIME_Timestamp *expiration_date,
-                         char **sender_account);
+                         struct TALER_FullPayto *sender_account);
 
 
 #endif
diff --git a/src/auditordb/pg_get_reserves.c b/src/auditordb/pg_get_reserves.c
index 222fec908..55ae81d3a 100644
--- a/src/auditordb/pg_get_reserves.c
+++ b/src/auditordb/pg_get_reserves.c
@@ -88,7 +88,7 @@ reserves_cb (void *cls,
       GNUNET_PQ_result_spec_absolute_time ("expiration_date",
                                            &dc.expiration_date),
       GNUNET_PQ_result_spec_string ("origin_account",
-                                    &dc.origin_account),
+                                    &dc.origin_account.full_payto),
       GNUNET_PQ_result_spec_end
     };
     enum GNUNET_GenericReturnValue rval;
diff --git a/src/auditordb/pg_get_wire_out_inconsistency.c b/src/auditordb/pg_get_wire_out_inconsistency.c
index 4e9ca905f..aa365b67e 100644
--- a/src/auditordb/pg_get_wire_out_inconsistency.c
+++ b/src/auditordb/pg_get_wire_out_inconsistency.c
@@ -70,7 +70,7 @@ wire_out_inconsistency_cb (void *cls,
       GNUNET_PQ_result_spec_uint64 ("row_id",
                                     &dc.row_id),
       GNUNET_PQ_result_spec_string ("destination_account",
-                                    &dc.destination_account),
+                                    &dc.destination_account.full_payto),
       GNUNET_PQ_result_spec_string ("diagnostic",
                                     &dc.diagnostic),
       GNUNET_PQ_result_spec_uint64 ("wire_out_serial_id",
diff --git a/src/auditordb/pg_insert_auditor_closure_lags.c b/src/auditordb/pg_insert_auditor_closure_lags.c
index b437a5d7f..f66c1df7c 100644
--- a/src/auditordb/pg_insert_auditor_closure_lags.c
+++ b/src/auditordb/pg_insert_auditor_closure_lags.c
@@ -31,7 +31,7 @@ TAH_PG_insert_auditor_closure_lags (
     GNUNET_PQ_query_param_uint64 (&dc->problem_row_id),
     GNUNET_PQ_query_param_absolute_time (&dc->deadline),
     GNUNET_PQ_query_param_auto_from_type (&dc->wtid),
-    GNUNET_PQ_query_param_string (dc->account),
+    GNUNET_PQ_query_param_string (dc->account.full_payto),
     GNUNET_PQ_query_param_end
   };
 
diff --git a/src/auditordb/pg_insert_pending_deposit.c b/src/auditordb/pg_insert_pending_deposit.c
index 50b655ee7..fd2b62505 100644
--- a/src/auditordb/pg_insert_pending_deposit.c
+++ b/src/auditordb/pg_insert_pending_deposit.c
@@ -30,7 +30,7 @@ enum GNUNET_DB_QueryStatus
 TAH_PG_insert_pending_deposit (
   void *cls,
   uint64_t batch_deposit_serial_id,
-  const struct TALER_PaytoHashP *wire_target_h_payto,
+  const struct TALER_FullPaytoHashP *wire_target_h_payto,
   const struct TALER_Amount *total_amount,
   struct GNUNET_TIME_Timestamp deadline)
 {
diff --git a/src/auditordb/pg_insert_pending_deposit.h b/src/auditordb/pg_insert_pending_deposit.h
index 7c2b59809..bebe47265 100644
--- a/src/auditordb/pg_insert_pending_deposit.h
+++ b/src/auditordb/pg_insert_pending_deposit.h
@@ -40,7 +40,7 @@ enum GNUNET_DB_QueryStatus
 TAH_PG_insert_pending_deposit (
   void *cls,
   uint64_t batch_deposit_serial_id,
-  const struct TALER_PaytoHashP *wire_target_h_payto,
+  const struct TALER_FullPaytoHashP *wire_target_h_payto,
   const struct TALER_Amount *total_amount,
   struct GNUNET_TIME_Timestamp deadline);
 
diff --git a/src/auditordb/pg_insert_reserve_in_inconsistency.c b/src/auditordb/pg_insert_reserve_in_inconsistency.c
index c584a0ff4..37bc20124 100644
--- a/src/auditordb/pg_insert_reserve_in_inconsistency.c
+++ b/src/auditordb/pg_insert_reserve_in_inconsistency.c
@@ -33,7 +33,7 @@ TAH_PG_insert_reserve_in_inconsistency (
                                  &dc->amount_wired),
     GNUNET_PQ_query_param_auto_from_type (&dc->reserve_pub),
     GNUNET_PQ_query_param_absolute_time (&dc->timestamp),
-    GNUNET_PQ_query_param_string (dc->account),
+    GNUNET_PQ_query_param_string (dc->account.full_payto),
     GNUNET_PQ_query_param_string (dc->diagnostic),
     GNUNET_PQ_query_param_end
   };
diff --git a/src/auditordb/pg_insert_reserve_info.c b/src/auditordb/pg_insert_reserve_info.c
index 4c99394fe..f0cc7ba77 100644
--- a/src/auditordb/pg_insert_reserve_info.c
+++ b/src/auditordb/pg_insert_reserve_info.c
@@ -32,7 +32,7 @@ TAH_PG_insert_reserve_info (
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
   struct GNUNET_TIME_Timestamp expiration_date,
-  const char *origin_account)
+  const struct TALER_FullPayto origin_account)
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_QueryParam params[] = {
@@ -52,9 +52,9 @@ TAH_PG_insert_reserve_info (
     TALER_PQ_query_param_amount (pg->conn,
                                  &rfb->history_fee_balance),
     GNUNET_PQ_query_param_timestamp (&expiration_date),
-    NULL == origin_account
+    NULL == origin_account.full_payto
     ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_string (origin_account),
+    : GNUNET_PQ_query_param_string (origin_account.full_payto),
     GNUNET_PQ_query_param_end
   };
 
diff --git a/src/auditordb/pg_insert_reserve_info.h b/src/auditordb/pg_insert_reserve_info.h
index b416aa556..a5764ac32 100644
--- a/src/auditordb/pg_insert_reserve_info.h
+++ b/src/auditordb/pg_insert_reserve_info.h
@@ -43,6 +43,6 @@ TAH_PG_insert_reserve_info (
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
   struct GNUNET_TIME_Timestamp expiration_date,
-  const char *origin_account);
+  const struct TALER_FullPayto origin_account);
 
 #endif
diff --git a/src/auditordb/pg_insert_wire_out_inconsistency.c b/src/auditordb/pg_insert_wire_out_inconsistency.c
index 2e9354644..431852c0f 100644
--- a/src/auditordb/pg_insert_wire_out_inconsistency.c
+++ b/src/auditordb/pg_insert_wire_out_inconsistency.c
@@ -28,7 +28,7 @@ TAH_PG_insert_wire_out_inconsistency (
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (dc->destination_account),
+    GNUNET_PQ_query_param_string (dc->destination_account.full_payto),
     GNUNET_PQ_query_param_string (dc->diagnostic),
     GNUNET_PQ_query_param_uint64 (&dc->wire_out_row_id),
     TALER_PQ_query_param_amount (pg->conn,
diff --git a/src/auditordb/pg_select_pending_deposits.c b/src/auditordb/pg_select_pending_deposits.c
index 1190fb132..6501d4fea 100644
--- a/src/auditordb/pg_select_pending_deposits.c
+++ b/src/auditordb/pg_select_pending_deposits.c
@@ -75,7 +75,7 @@ wire_missing_cb (void *cls,
   {
     uint64_t batch_deposit_serial_id;
     struct TALER_Amount total_amount;
-    struct TALER_PaytoHashP wire_target_h_payto;
+    struct TALER_FullPaytoHashP wire_target_h_payto;
     struct GNUNET_TIME_Timestamp deadline;
     struct GNUNET_PQ_ResultSpec rs[] = {
       GNUNET_PQ_result_spec_uint64 ("batch_deposit_serial_id",