From 0f5ce284c4601f1819a9d2a91c120acdaa72fe15 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 18 Mar 2017 22:38:31 +0100
Subject: deal with some minor FIXMEs in auditor

---
 src/auditordb/test_auditordb.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'src/auditordb/test_auditordb.c')

diff --git a/src/auditordb/test_auditordb.c b/src/auditordb/test_auditordb.c
index d3e933133..03ceb609d 100644
--- a/src/auditordb/test_auditordb.c
+++ b/src/auditordb/test_auditordb.c
@@ -208,7 +208,7 @@ run (void *cls)
     .last_deposit_serial_id = 123,
     .last_melt_serial_id = 456,
     .last_refund_serial_id = 789,
-    .last_prewire_serial_id = 555
+    .last_wire_out_serial_id = 555
   };
   struct TALER_AUDITORDB_ProgressPoint pp2 = {
     .last_reserve_in_serial_id = 0,
@@ -216,7 +216,7 @@ run (void *cls)
     .last_deposit_serial_id = 0,
     .last_melt_serial_id = 0,
     .last_refund_serial_id = 0,
-    .last_prewire_serial_id = 0
+    .last_wire_out_serial_id = 0
   };
 
   FAILIF (GNUNET_OK !=
@@ -232,7 +232,7 @@ run (void *cls)
   pp.last_deposit_serial_id++;
   pp.last_melt_serial_id++;
   pp.last_refund_serial_id++;
-  pp.last_prewire_serial_id++;
+  pp.last_wire_out_serial_id++;
 
   FAILIF (GNUNET_OK !=
           plugin->update_auditor_progress (plugin->cls,
@@ -253,7 +253,7 @@ run (void *cls)
            (pp.last_deposit_serial_id != pp2.last_deposit_serial_id) ||
            (pp.last_melt_serial_id != pp2.last_melt_serial_id) ||
            (pp.last_refund_serial_id != pp2.last_refund_serial_id) ||
-           (pp.last_prewire_serial_id != pp2.last_prewire_serial_id) );
+           (pp.last_wire_out_serial_id != pp2.last_wire_out_serial_id) );
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test: insert_reserve_info\n");
@@ -275,16 +275,11 @@ run (void *cls)
                                        &master_pub,
                                        &reserve_balance,
                                        &withdraw_fee_balance,
-                                       past,
-                                       pp.last_reserve_in_serial_id,
-                                       pp.last_reserve_out_serial_id));
+                                       past));
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test: update_reserve_info\n");
 
-  pp.last_reserve_in_serial_id++;
-  pp.last_reserve_out_serial_id++;
-
   FAILIF (GNUNET_OK !=
           plugin->update_reserve_info (plugin->cls,
                                        session,
@@ -292,9 +287,7 @@ run (void *cls)
                                        &master_pub,
                                        &reserve_balance,
                                        &withdraw_fee_balance,
-                                       future,
-                                       pp.last_reserve_in_serial_id,
-                                       pp.last_reserve_out_serial_id));
+                                       future));
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test: get_reserve_info\n");
@@ -307,15 +300,11 @@ run (void *cls)
                                     &rowid,
                                     &reserve_balance2,
                                     &withdraw_fee_balance2,
-                                    &date,
-                                    &pp2.last_reserve_in_serial_id,
-                                    &pp2.last_reserve_out_serial_id));
+                                    &date));
 
   FAILIF (0 != memcmp (&date, &future, sizeof (future))
           || 0 != memcmp (&reserve_balance2, &reserve_balance, sizeof (reserve_balance))
-          || 0 != memcmp (&withdraw_fee_balance2, &withdraw_fee_balance, sizeof (withdraw_fee_balance))
-          || pp2.last_reserve_in_serial_id != pp.last_reserve_in_serial_id
-          || pp2.last_reserve_out_serial_id != pp.last_reserve_out_serial_id);
+          || 0 != memcmp (&withdraw_fee_balance2, &withdraw_fee_balance, sizeof (withdraw_fee_balance)));
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test: insert_reserve_summary\n");
-- 
cgit v1.2.3