Merge branch 'master' into enrico-tree-trait

summa-dev · Nov 8, 2023 · 23c8d8e · 23c8d8e
2 parents c80e964 + 7489c53
commit 23c8d8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/backend/examples/summa_solvency_flow.rs b/backend/examples/summa_solvency_flow.rs
@@ -10,7 +10,7 @@ use summa_backend::{
         round::{MstInclusionProof, Round},
     },
     contracts::signer::{AddressInput, SummaSigner},
-    sample_entries::*,
+    sample_entries::get_sample_entries,
     tests::initialize_test_env,
 };
 use summa_solvency::merkle_sum_tree::{utils::generate_leaf_hash, MerkleSumTree};
@@ -25,6 +25,9 @@ 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.
@@ -37,8 +40,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
     )
     .await?;
 
-    // Each CEX prepares its own `signature` CSV file.
-    let signature_csv_path = "src/apis/csv/signatures.csv";
     let mut address_ownership_client = AddressOwnership::new(&signer, signature_csv_path).unwrap();
 
     // Dispatch the proof of address ownership.

diff --git a/zk_prover/src/circuits/solvency.rs b/zk_prover/src/circuits/solvency.rs
@@ -3,7 +3,7 @@ use crate::chips::merkle_sum_tree::{MerkleSumTreeChip, MerkleSumTreeConfig};
 use crate::chips::poseidon::hash::{PoseidonChip, PoseidonConfig};
 use crate::chips::poseidon::poseidon_spec::PoseidonSpec;
 use crate::circuits::traits::CircuitBase;
-use crate::merkle_sum_tree::{MerkleSumTree, Tree};
+use crate::merkle_sum_tree::Tree;
 use halo2_proofs::circuit::{AssignedCell, Layouter, SimpleFloorPlanner, Value};
 use halo2_proofs::halo2curves::bn256::Fr as Fp;
 use halo2_proofs::plonk::{