Merge remote-tracking branch 'origin/v0.7' into sync-ff-0.13

scroll-tech · Dec 1, 2023 · 9cd825e · 9cd825e
2 parents 82b491d + 733a975
commit 9cd825e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/mpt.rs b/src/mpt.rs
@@ -121,7 +121,7 @@ impl MptCircuitConfig {
         let (u32s, u64s, u128s, frs) = byte_representations(proofs);
 
         let mpt_updates_assign_dur = Instant::now();
-        let use_par = std::env::var("PARALLEL_SYN").map_or(false, |s| s == *"true");
+        let use_par = std::env::var("PARALLEL_SYN").map_or(true, |s| s == *"true");
         if use_par {
             let n_assigned_rows = self.mpt_update.assign_par(layouter, proofs, randomness);
 

diff --git a/src/types.rs b/src/types.rs
@@ -832,8 +832,6 @@ impl Proof {
             self.new_account_hash_traces[5][2],
             self.address_hash_traces.get(0).unwrap().3
         );
-        // if this still the case????
-
         if let Some(old_leaf) = self.leafs[0] {
             assert_eq!(
                 domain_hash(old_leaf.key, old_leaf.value_hash, HashDomain::Leaf),