Revert "Added batching using DB. (#724)" (#729)

This reverts commit f4fcc03.
worldcoin · May 14, 2024 · 20b9efd · 20b9efd
1 parent 6e99a96
commit 20b9efd
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 912 deletions.
diff --git a/schemas/database/013_batches_and_transactions.sql b/schemas/database/013_batches_and_transactions.sql
diff --git a/src/app.rs b/src/app.rs
@@ -15,7 +15,7 @@ use crate::database::{Database, DatabaseExt as _};
 use crate::ethereum::Ethereum;
 use crate::identity_tree::{
     CanonicalTreeBuilder, Hash, InclusionProof, ProcessedStatus, RootItem, Status, TreeState,
-    TreeUpdate, TreeVersionReadOps, TreeWithNextVersion, UnprocessedStatus,
+    TreeUpdate, TreeVersionReadOps, UnprocessedStatus,
 };
 use crate::prover::map::initialize_prover_maps;
 use crate::prover::{ProverConfig, ProverType};
@@ -261,9 +261,6 @@ impl App {
 
         let (processed, batching_builder) = processed_builder.seal_and_continue();
         let (batching, mut latest_builder) = batching_builder.seal_and_continue();
-
-        // We are duplicating updates here for some commitments that were batched but
-        // this is an idempotent operation
         let pending_items = self
             .database
             .get_commitments_by_status(ProcessedStatus::Pending)
@@ -272,15 +269,6 @@ impl App {
             latest_builder.update(&update);
         }
         let latest = latest_builder.seal();
-
-        let batch = self.database.get_latest_batch().await?;
-        if let Some(batch) = batch {
-            if batching.get_root() != batch.next_root {
-                batching.apply_updates_up_to(batch.next_root);
-            }
-            assert_eq!(batching.get_root(), batch.next_root);
-        }
-
         Ok(Some(TreeState::new(mined, processed, batching, latest)))
     }
 
@@ -367,14 +355,6 @@ impl App {
 
         let latest = latest_builder.seal();
 
-        let batch = self.database.get_latest_batch().await?;
-        if let Some(batch) = batch {
-            if batching.get_root() != batch.next_root {
-                batching.apply_updates_up_to(batch.next_root);
-            }
-            assert_eq!(batching.get_root(), batch.next_root);
-        }
-
         Ok(TreeState::new(mined, processed, batching, latest))
     }