fix: build in zk_prover; removed csv & csv_parser; re-exports Entry a…

…nd MerkleSumTree
summa-dev · Nov 8, 2023 · 8b44b2f · 8b44b2f
1 parent 2f14b36
commit 8b44b2f
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 140 deletions.
diff --git a/backend/examples/summa_solvency_flow.rs b/backend/examples/summa_solvency_flow.rs
@@ -25,9 +25,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // 1. Submit ownership proof
     //
-    // Each CEX prepares its own `signature` CSV file.
-    let signature_csv_path = "src/apis/csv/signatures.csv";
-
     // The signer instance would be shared with `address_ownership` and `round` instances
     //
     // Using AddressInput::Address to directly provide the summa_contract's address.

diff --git a/backend/src/apis/csv/assets.csv b/backend/src/apis/csv/assets.csv
diff --git a/backend/src/apis/csv/signatures.csv b/backend/src/apis/csv/signatures.csv
diff --git a/backend/src/apis/csv_parser.rs b/backend/src/apis/csv_parser.rs
diff --git a/backend/src/apis/mod.rs b/backend/src/apis/mod.rs
@@ -1,3 +1,2 @@
 pub mod address_ownership;
-pub mod csv_parser;
 pub mod round;
diff --git a/backend/src/lib.rs b/backend/src/lib.rs
@@ -3,3 +3,5 @@ pub mod apis;
 pub mod contracts;
 pub mod sample_data;
 pub mod tests;
+pub use merkle_sum_tree::{Entry, MerkleSumTree};
+use summa_solvency::merkle_sum_tree;
diff --git a/zk_prover/src/circuits/tests.rs b/zk_prover/src/circuits/tests.rs
@@ -765,7 +765,7 @@ mod test {
             MerkleSumTree::<N_ASSETS, N_BYTES>::new("src/merkle_sum_tree/csv/entry_16.csv")
                 .unwrap();
 
-        let circuit = SolvencyCircuit::<N_ASSETS, N_BYTES>::init(merkle_sum_tree, asset_sums);
+        let circuit = SolvencyCircuit::<N_ASSETS, N_BYTES>::init(&merkle_sum_tree, asset_sums);
 
         let root =
             BitMapBackend::new("prints/solvency-layout.png", (2048, 32768)).into_drawing_area();