fix: latest v1; minor changes on comments

Cargo.toml

@@ -11,7 +11,7 @@ const_env = "0.1.2"
 num-bigint = "0.4.4"
 serde = { version = "1.0.192", features = ["derive"] }
 serde_json = "1.0.108"
-summa-backend = { git = "https://github.com/summa-dev/summa-solvency", branch = "v1-for-summa-aggregation", version = "0.1.0" }
+summa-backend = { git = "https://github.com/summa-dev/summa-solvency", branch = "v1-improvements-and-consolidation" }
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2", tag = "v2023_04_20"}
 tokio = { version = "1.34.0", features = ["full"] }
 reqwest = "0.11.22"

README.md

@@ -1,6 +1,6 @@
 # Summa Aggregation
 
-Summa Aggregation is a scalable solution specifically designed to accelerate the process of building Merkle sum trees. It addresses the time-intensive challenge of constructing these trees by enabling efficient scaling through parallelization and distributed computation across multiple machines.
+Summa Aggregation is a scalable solution specifically designed to accelerate the process of building Merkle sum tree. It addresses the time-intensive challenge of constructing these trees by enabling efficient scaling through parallelization and distributed computation across multiple machines.
 
 ## Running test
 

src/aggregation_merkle_sum_tree.rs

@@ -8,7 +8,7 @@ use summa_backend::merkle_sum_tree::{
 
 /// Aggregation Merkle Sum Tree Data Structure.
 ///
-/// Starting from a set of "mini" Merkle Sum Trees of equal depth, N_CURRENCIES and N_BYTES, the Aggregation Merkle Sum Tree inherits the properties of a Merkle Sum Tree and adds the following:
+/// Starting from a set of "mini" Merkle Sum Tree of equal depth, N_CURRENCIES and N_BYTES, the Aggregation Merkle Sum Tree inherits the properties of a Merkle Sum Tree and adds the following:
 /// * Each Leaf of the Aggregation Merkle Sum Tree is the root of a "mini" Merkle Sum Tree made of `hash` and `balances`
 ///
 /// # Type Parameters
@@ -127,8 +127,8 @@ impl<const N_CURRENCIES: usize, const N_BYTES: usize> Tree<N_CURRENCIES, N_BYTES
 impl<const N_CURRENCIES: usize, const N_BYTES: usize>
     AggregationMerkleSumTree<N_CURRENCIES, N_BYTES>
 {
-    /// Builds a AggregationMerkleSumTree from a set of mini MerkleSumTrees
-    /// The leaves of the AggregationMerkleSumTree are the roots of the mini MerkleSumTrees
+    /// Builds a AggregationMerkleSumTree from a set of mini MerkleSumTree
+    /// The leaves of the AggregationMerkleSumTree are the roots of the mini MerkleSumTree
     pub fn new(
         mini_trees: Vec<MerkleSumTree<N_CURRENCIES, N_BYTES>>,
         cryptocurrencies: Vec<Cryptocurrency>,
@@ -297,7 +297,7 @@ mod test {
 
     #[test]
     fn test_aggregation_mst_overflow() {
-        // create new mini merkle sum trees. The accumulated balance for each mini tree is in the expected range
+        // create new mini merkle sum tree. The accumulated balance for each mini tree is in the expected range
         // note that the accumulated balance of the tree generated from entry_16_4 is just in the expected range for 1 unit
         let merkle_sum_tree_1 =
             MerkleSumTree::<N_CURRENCIES, N_BYTES>::from_csv("src/orchestrator/csv/entry_16.csv")

src/json_mst.rs

@@ -136,7 +136,7 @@ impl JsonMerkleSumTree {
             N_CURRENCIES
         ];
 
-        MerkleSumTree::<N_CURRENCIES, N_BYTES>::new(
+        MerkleSumTree::<N_CURRENCIES, N_BYTES>::from_params(
             root,
             nodes,
             self.depth,

src/mini_tree_generator.rs

@@ -4,13 +4,8 @@ use const_env::from_env;
 use crate::json_mst::{JsonEntry, JsonMerkleSumTree};
 use summa_backend::merkle_sum_tree::{Cryptocurrency, Entry, MerkleSumTree};
 
-#[from_env]
-const N_CURRENCIES: usize = 2;
-#[from_env]
-const N_BYTES: usize = 14;
-
-/// Mini Tree Generator is designed to create Merkle Sum Trees using the Axum web framework. 
-/// It primarily handles HTTP requests to generate trees based on provided JSON entries.
+/// Mini Tree Generator is designed to create Merkle Sum Tree using the Axum web framework. 
+/// It primarily handles HTTP requests to generate tree based on provided JSON entries.
 ///
 /// Constants:
 /// - `N_CURRENCIES`: The number of cryptocurrencies involved. Set via environment variables.
@@ -21,6 +16,11 @@ const N_BYTES: usize = 14;
 ///   It converts `JsonEntry` objects into `Entry<N_CURRENCIES>` instances and then constructs the `MerkleSumTree`.
 ///   The function handles the conversion of the `MerkleSumTree` into a JSON format (`JsonMerkleSumTree`) for the response.
 ///
+#[from_env]
+const N_CURRENCIES: usize = 2;
+#[from_env]
+const N_BYTES: usize = 14;
+
 pub async fn create_mst(
     Json(json_entries): Json<Vec<JsonEntry>>,
 ) -> Result<impl IntoResponse, (StatusCode, Json<JsonMerkleSumTree>)> {