Merge pull request #804 from worldcoin/piohei/cleanup

Allow only to update latest tree.

src/app.rs

@@ -16,7 +16,7 @@ use crate::identity::processor::{
 };
 use crate::identity::validator::IdentityValidator;
 use crate::identity_tree::initializer::TreeInitializer;
-use crate::identity_tree::{Hash, RootItem, TreeState, TreeVersionOps};
+use crate::identity_tree::{Hash, RootItem, TreeState, TreeVersionReadOps};
 use crate::prover::map::initialize_prover_maps;
 use crate::prover::repository::ProverRepository;
 use crate::prover::{ProverConfig, ProverType};

src/identity_tree/initializer.rs

@@ -9,7 +9,7 @@ use crate::database::methods::DbMethods;
 use crate::database::Database;
 use crate::identity::processor::IdentityProcessor;
 use crate::identity_tree::{
-    CanonicalTreeBuilder, Hash, ProcessedStatus, TreeState, TreeUpdate, TreeVersionOps,
+    CanonicalTreeBuilder, Hash, ProcessedStatus, TreeState, TreeUpdate, TreeVersionReadOps,
     TreeWithNextVersion,
 };
 use crate::utils::tree_updates::dedup_tree_updates;

src/identity_tree/mod.rs

@@ -398,9 +398,7 @@ impl<V: Version<TreeVersion = lazy_merkle_tree::Derived>> TreeVersion<V> {
 /// The public-facing API for reading from a tree version. It is implemented for
 /// all versions. This being a trait allows us to hide some of the
 /// implementation details.
-pub trait TreeVersionOps {
-    fn update(&self, leaf_index: usize, element: Hash);
-
+pub trait TreeVersionReadOps {
     /// Returns the current tree root.
     fn get_root(&self) -> Hash;
     /// Returns the next free leaf.
@@ -413,14 +411,10 @@ pub trait TreeVersionOps {
     fn get_leaf(&self, leaf: usize) -> Hash;
 }
 
-impl<V: Version> TreeVersionOps for TreeVersion<V>
+impl<V: Version> TreeVersionReadOps for TreeVersion<V>
 where
     TreeVersionData<V::TreeVersion>: BasicTreeOps,
 {
-    fn update(&self, leaf_index: usize, element: Hash) {
-        self.get_data().update(leaf_index, element);
-    }
-
     fn get_root(&self) -> Hash {
         self.get_data().get_root()
     }
@@ -456,6 +450,11 @@ impl<V: Version> TreeVersion<V> {
 }
 
 impl TreeVersion<Latest> {
+    /// Updates tree by inserting element at leaf index.
+    pub fn update(&self, leaf_index: usize, element: Hash) {
+        self.get_data().update(leaf_index, element);
+    }
+
     /// Appends many identities to the tree, returns a list with the root, proof
     /// of inclusion and leaf index
     #[must_use]

src/task_monitor/tasks/create_batches.rs

@@ -15,7 +15,7 @@ use crate::database;
 use crate::database::methods::DbMethods as _;
 use crate::database::Database;
 use crate::identity_tree::{
-    AppliedTreeUpdate, Hash, Intermediate, TreeVersion, TreeVersionOps, TreeWithNextVersion,
+    AppliedTreeUpdate, Hash, Intermediate, TreeVersion, TreeVersionReadOps, TreeWithNextVersion,
 };
 use crate::prover::identity::Identity;
 use crate::prover::repository::ProverRepository;

src/task_monitor/tasks/delete_identities.rs

@@ -11,7 +11,7 @@ use tracing::info;
 use crate::app::App;
 use crate::database::methods::DbMethods;
 use crate::database::types::DeletionEntry;
-use crate::identity_tree::{Hash, TreeVersionOps};
+use crate::identity_tree::{Hash, TreeVersionReadOps};
 
 // Deletion here differs from insert_identites task. This is because two
 // different flows are created for both tasks. Due to how our prover works

src/task_monitor/tasks/insert_identities.rs

@@ -8,7 +8,7 @@ use tracing::info;
 use crate::app::App;
 use crate::database::methods::DbMethods as _;
 use crate::database::IsolationLevel;
-use crate::identity_tree::TreeVersionOps;
+use crate::identity_tree::TreeVersionReadOps;
 
 // Insertion here differs from delete_identities task. This is because two
 // different flows are created for both tasks. We need to insert identities as

tests/common/mod.rs

@@ -40,7 +40,7 @@ pub mod prelude {
         AppConfig, Config, DatabaseConfig, OzDefenderConfig, ProvidersConfig, RelayerConfig,
         ServerConfig, TreeConfig, TxSitterConfig,
     };
-    pub use signup_sequencer::identity_tree::{Hash, TreeVersionOps};
+    pub use signup_sequencer::identity_tree::{Hash, TreeVersionReadOps};
     pub use signup_sequencer::prover::ProverType;
     pub use signup_sequencer::server;
     pub use signup_sequencer::shutdown::Shutdown;
@@ -76,7 +76,7 @@ use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use reqwest::{Body, Client, Method, Request, RequestBuilder, StatusCode};
 use semaphore::poseidon_tree::Proof;
-use signup_sequencer::identity_tree::{InclusionProof, TreeState, TreeVersionOps};
+use signup_sequencer::identity_tree::{InclusionProof, TreeState, TreeVersionReadOps};
 use signup_sequencer::server::data::{
     AddBatchSizeRequest, DeletionRequest, InclusionProofRequest, InclusionProofResponse,
     InsertCommitmentRequest, RemoveBatchSizeRequest, VerifySemaphoreProofRequest,