remove legacy tables

14 files changed, 29 insertions, 321 deletions

diff --git a/src/auditordb/0002-auditor_balance_summary.sql b/src/auditordb/0002-auditor_balance_summary.sql
deleted file mode 100644
index ea8458574..000000000
--- a/src/auditordb/0002-auditor_balance_summary.sql
+++ /dev/null
@@ -1,55 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-
--- NEW:
-CREATE TABLE IF NOT EXISTS auditor_balance_summary (
-    balance_key TEXT PRIMARY KEY
-   ,balance_value taler_amount
-  );
-COMMENT ON TABLE auditor_balance_summary
-  IS 'table storing various global balances of the auditor';
-COMMENT ON COLUMN auditor_balance_summary.balance_key
- IS 'unique name for the balance value';
-COMMENT ON COLUMN auditor_balance_summary.balance_value
- IS 'balance amount';
-
-
--- old:
-CREATE TABLE IF NOT EXISTS auditor_balance_summary (
-    ,denom_balance_val INT8 NOT NULL
-    ,denom_balance_frac INT4 NOT NULL
-    ,deposit_fee_balance_val INT8 NOT NULL
-    ,deposit_fee_balance_frac INT4 NOT NULL
-    ,melt_fee_balance_val INT8 NOT NULL
-    ,melt_fee_balance_frac INT4 NOT NULL
-    ,refund_fee_balance_val INT8 NOT NULL
-    ,refund_fee_balance_frac INT4 NOT NULL
-    ,purse_fee_balance_val INT8 NOT NULL
-    ,purse_fee_balance_frac INT4 NOT NULL
-    ,open_deposit_fee_balance_val INT8 NOT NULL
-    ,open_deposit_fee_balance_frac INT4 NOT NULL
-    ,risk_val INT8 NOT NULL
-    ,risk_frac INT4 NOT NULL
-    ,loss_val INT8 NOT NULL
-    ,loss_frac INT4 NOT NULL
-    ,irregular_loss_val INT8 NOT NULL
-    ,irregular_loss_frac INT4 NOT NULL
-    );
-COMMENT ON TABLE auditor_balance_summary
-  IS 'the sum of the outstanding coins from auditor_denomination_pending (denom_pubs must belong to the respectives exchange master public key); it represents the auditor_balance_summary of the exchange at this point (modulo unexpected historic_loss-style events where denomination keys are compromised)';
-COMMENT ON COLUMN auditor_balance_summary.denom_balance_frac
- IS 'total amount we should have in escrow for all denominations';
diff --git a/src/auditordb/0002-wire_auditor_progress.sql b/src/auditordb/0002-auditor_balances.sql
index 05887e6c5..396381e0b 100644
--- a/src/auditordb/0002-wire_auditor_progress.sql
+++ b/src/auditordb/0002-auditor_balances.sql
@@ -1,6 +1,6 @@
 --
 -- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
+-- Copyright (C) 2014--2023 Taler Systems SA
 --
 -- TALER is free software; you can redistribute it and/or modify it under the
 -- terms of the GNU General Public License as published by the Free Software
@@ -14,8 +14,13 @@
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
 
-CREATE TABLE IF NOT EXISTS wire_auditor_progress
-    ,last_timestamp INT8 NOT NULL
-    ,last_reserve_close_uuid INT8 NOT NULL
-    --,PRIMARY KEY (master_pub)
-    );
+CREATE TABLE IF NOT EXISTS auditor_balances (
+    balance_key TEXT PRIMARY KEY
+   ,balance_value taler_amount
+  );
+COMMENT ON TABLE auditor_balances
+  IS 'table storing various global balances of the auditor';
+COMMENT ON COLUMN auditor_balances.balance_key
+ IS 'unique name for the balance value';
+COMMENT ON COLUMN auditor_balances.balance_value
+ IS 'balance amount';
diff --git a/src/auditordb/0002-auditor_predicted_result.sql b/src/auditordb/0002-auditor_predicted_result.sql
deleted file mode 100644
index 5792313c6..000000000
--- a/src/auditordb/0002-auditor_predicted_result.sql
+++ /dev/null
@@ -1,24 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-
--- FIXME: should be folded into the new general balances table!
-CREATE TABLE IF NOT EXISTS auditor_predicted_result
-    (balance taler_amount NOT NULL
-    ,drained taler_amount NOT NULL
-    );
-COMMENT ON TABLE auditor_predicted_result
-  IS 'Table with the sum of the ledger, auditor_historic_revenue and the auditor_reserve_balance and the drained profits.  This is the final amount that the exchange should have in its bank account right now (and the total amount drained as profits to non-escrow accounts).';
diff --git a/src/auditordb/0002-auditor_reserve_balance.sql b/src/auditordb/0002-auditor_progress.sql
index 46c18ec9d..40a9fbf7c 100644
--- a/src/auditordb/0002-auditor_reserve_balance.sql
+++ b/src/auditordb/0002-auditor_progress.sql
@@ -14,14 +14,13 @@
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
 
-CREATE TABLE IF NOT EXISTS auditor_reserve_balance
-    ,reserve_balance taler_amount NOT NULL
-    ,reserve_loss taler_amount NOT NULL
-    ,withdraw_fee_balance taler_amount NOT NULL
-    ,close_fee_balance taler_amount NOT NULL
-    ,purse_fee_balance taler_amount NOT NULL
-    ,open_fee_balance taler_amount NOT NULL
-    ,history_fee_balance taler_amount NOT NULL
-    );
-COMMENT ON TABLE auditor_reserve_balance
-  IS 'sum of the balances of all customer reserves';
+CREATE TABLE IF NOT EXISTS auditor_progress
+  (progress_key TEXT NOT NULL
+  ,progress_offset INT8 NOT NULL
+  );
+COMMENT ON TABLE auditor_progress
+  IS 'Information about to the point until which the audit has progressed.  Used for SELECTing the statements to process.';
+COMMENT ON COLUMN auditor_progress.progress_key
+  IS 'Name of the progress indicator';
+COMMENT ON COLUMN auditor_progress.progress_offset
+  IS 'Table offset or timestamp or counter until which the audit has progressed';
diff --git a/src/auditordb/0002-auditor_progress_aggregation.sql b/src/auditordb/0002-auditor_progress_aggregation.sql
deleted file mode 100644
index 033d63be7..000000000
--- a/src/auditordb/0002-auditor_progress_aggregation.sql
+++ /dev/null
@@ -1,23 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS auditor_progress_aggregation
-    ,last_wire_out_serial_id INT8 NOT NULL DEFAULT 0
-    -- ,PRIMARY KEY (master_pub)
-    );
-COMMENT ON TABLE auditor_progress_aggregation
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
diff --git a/src/auditordb/0002-auditor_progress_coin.sql b/src/auditordb/0002-auditor_progress_coin.sql
deleted file mode 100644
index 8f555164f..000000000
--- a/src/auditordb/0002-auditor_progress_coin.sql
+++ /dev/null
@@ -1,31 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS auditor_progress_coin
-    ,last_withdraw_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_deposit_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_melt_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_refund_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_recoup_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_recoup_refresh_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_open_deposits_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_purse_deposits_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_purse_decision_serial_id INT8 NOT NULL DEFAULT 0
-    -- ,PRIMARY KEY (master_pub)
-    );
-COMMENT ON TABLE auditor_progress_coin
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
diff --git a/src/auditordb/0002-auditor_progress_deposit_confirmation.sql b/src/auditordb/0002-auditor_progress_deposit_confirmation.sql
deleted file mode 100644
index 73d3c09db..000000000
--- a/src/auditordb/0002-auditor_progress_deposit_confirmation.sql
+++ /dev/null
@@ -1,23 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS auditor_progress_deposit_confirmation
-    ,last_deposit_confirmation_serial_id INT8 NOT NULL DEFAULT 0
-    --,PRIMARY KEY (master_pub)
-    );
-COMMENT ON TABLE auditor_progress_deposit_confirmation
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
diff --git a/src/auditordb/0002-auditor_progress_purse.sql b/src/auditordb/0002-auditor_progress_purse.sql
deleted file mode 100644
index 29e14dc98..000000000
--- a/src/auditordb/0002-auditor_progress_purse.sql
+++ /dev/null
@@ -1,27 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS auditor_progress_purse
-    ,last_purse_request_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_purse_decision_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_purse_merges_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_account_merges_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_purse_deposits_serial_id INT8 NOT NULL DEFAULT 0
-    -- ,PRIMARY KEY (master_pub)
-    );
-COMMENT ON TABLE auditor_progress_purse
-  IS 'information as to which purses the purse auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
diff --git a/src/auditordb/0002-auditor_progress_reserve.sql b/src/auditordb/0002-auditor_progress_reserve.sql
deleted file mode 100644
index e1b9b4817..000000000
--- a/src/auditordb/0002-auditor_progress_reserve.sql
+++ /dev/null
@@ -1,24 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS auditor_progress_reserve
-    ,reserve_name TEXT NOT NULL -- FIXME: I think you missunderstood how the progress points should work in the future...
-    ,serial_id INT8 NOT NULL
-   --  ,PRIMARY KEY (master_pub)
-    );
-COMMENT ON TABLE auditor_progress_reserve
-  IS 'information as to which transactions the reserve auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
diff --git a/src/auditordb/0002-auditor_purse_summary.sql b/src/auditordb/0002-auditor_purse_summary.sql
deleted file mode 100644
index 7c21271c1..000000000
--- a/src/auditordb/0002-auditor_purse_summary.sql
+++ /dev/null
@@ -1,23 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS auditor_purse_summary
-    ,balance_val INT8 NOT NULL
-    ,balance_frac INT4 NOT NULL
-    ,open_purses INT8 NOT NULL -- FIXME: do we need this column?
-    );
-COMMENT ON TABLE auditor_purse_summary
-  IS 'sum of the balances in open purses';
diff --git a/src/auditordb/0002-auditor_wire_fee_balance.sql b/src/auditordb/0002-auditor_wire_fee_balance.sql
deleted file mode 100644
index 85e5f710f..000000000
--- a/src/auditordb/0002-auditor_wire_fee_balance.sql
+++ /dev/null
@@ -1,22 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS auditor_wire_fee_balance
-    ,wire_fee_balance_val INT8 NOT NULL
-    ,wire_fee_balance_frac INT4 NOT NULL
-    );
-COMMENT ON TABLE auditor_wire_fee_balance
-  IS 'sum of the balances of all wire fees';
\ No newline at end of file
diff --git a/src/auditordb/0002-wire_auditor_account_progress.sql b/src/auditordb/0002-wire_auditor_account_progress.sql
deleted file mode 100644
index 9b346a102..000000000
--- a/src/auditordb/0002-wire_auditor_account_progress.sql
+++ /dev/null
@@ -1,27 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
-CREATE TABLE IF NOT EXISTS wire_auditor_account_progress
-    ,account_name TEXT NOT NULL
-    ,last_wire_reserve_in_serial_id INT8 NOT NULL DEFAULT 0
-    ,last_wire_wire_out_serial_id INT8 NOT NULL DEFAULT 0
-    ,wire_in_off INT8 NOT NULL
-    ,wire_out_off INT8 NOT NULL
-    ,PRIMARY KEY (account_name)
-    );
-COMMENT ON TABLE wire_auditor_account_progress
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
diff --git a/src/auditordb/auditor-0002.sql.in b/src/auditordb/auditor-0002.sql.in
index 891b61b4e..75b6991ce 100644
--- a/src/auditordb/auditor-0002.sql.in
+++ b/src/auditordb/auditor-0002.sql.in
@@ -1,6 +1,6 @@
 --
 -- This file is part of TALER
--- Copyright (C) 2014--2022 Taler Systems SA
+-- Copyright (C) 2014--2023 Taler Systems SA
 --
 -- TALER is free software; you can redistribute it and/or modify it under the
 -- terms of the GNU General Public License as published by the Free Software
@@ -27,24 +27,14 @@ CREATE TYPE taler_amount
 COMMENT ON TYPE taler_amount
   IS 'Stores an amount, fraction is in units of 1/100000000 of the base value';
 
+#include "0002-auditor_balances.sql"
 #include "0002-auditor_denomination_pending.sql"
-#include "0002-auditor_wire_fee_balance.sql"
-#include "0002-auditor_balance_summary.sql"
 #include "0002-auditor_exchange_signkeys.sql"
 #include "0002-auditor_historic_denomination_revenue.sql"
 #include "0002-auditor_historic_reserve_summary.sql"
-#include "0002-auditor_predicted_result.sql"
-#include "0002-auditor_progress_aggregation.sql"
-#include "0002-auditor_progress_coin.sql"
-#include "0002-auditor_progress_deposit_confirmation.sql"
-#include "0002-auditor_progress_purse.sql"
-#include "0002-auditor_progress_reserve.sql"
-#include "0002-auditor_purse_summary.sql"
+#include "0002-auditor_progress.sql"
 #include "0002-auditor_purses.sql"
-#include "0002-auditor_reserve_balance.sql"
 #include "0002-auditor_reserves.sql"
 #include "0002-deposit_confirmations.sql"
-#include "0002-wire_auditor_account_progress.sql"
-#include "0002-wire_auditor_progress.sql"
 
 COMMIT;
diff --git a/src/auditordb/restart.sql b/src/auditordb/restart.sql
index a3cf09e6e..090c86b53 100644
--- a/src/auditordb/restart.sql
+++ b/src/auditordb/restart.sql
@@ -31,20 +31,13 @@ SET search_path TO auditor;
 -- Unlike the other SQL files, it SHOULD be updated to reflect the
 -- latest requirements for dropping tables.
 
-DELETE FROM auditor_predicted_result;
-DELETE FROM auditor_historic_denomination_revenue;
-DELETE FROM auditor_balance_summary;
+DELETE FROM auditor_balances;
 DELETE FROM auditor_denomination_pending;
-DELETE FROM auditor_reserve_balance;
-DELETE FROM auditor_wire_fee_balance;
-DELETE FROM auditor_reserves;
-DELETE FROM auditor_progress_reserve;
-DELETE FROM auditor_progress_aggregation;
-DELETE FROM auditor_progress_deposit_confirmation;
-DELETE FROM auditor_progress_coin;
-DELETE FROM wire_auditor_progress;
-DELETE FROM wire_auditor_account_progress;
+DELETE FROM auditor_historic_denomination_revenue;
 DELETE FROM auditor_historic_reserve_summary;
+DELETE FROM auditor_progress;
+DELETE FROM auditor_purses;
+DELETE FROM auditor_reserves;
 
 -- And we're out of here...
 COMMIT;