fix rebase

scroll-tech · Oct 31, 2023 · ec98162 · ec98162
1 parent 4eb1805
commit ec98162
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/constraint_builder.rs b/src/constraint_builder.rs
@@ -1,8 +1,5 @@
 use crate::gadgets::poseidon::PoseidonLookup;
-use halo2_proofs::{
-    arithmetic::FieldExt,
-    plonk::{ConstraintSystem},
-};
+use halo2_proofs::{arithmetic::FieldExt, plonk::ConstraintSystem};
 use itertools::Itertools;
 
 mod binary_column;

diff --git a/src/gadgets/canonical_representation.rs b/src/gadgets/canonical_representation.rs
@@ -268,11 +268,7 @@ mod test {
                         selector.enable(&mut region, offset);
                     }
                     byte_bit.assign(&mut region);
-<<<<<<< HEAD
-                    canonical_representation.assign(&mut region, randomness, &self.values, 256);
-=======
                     canonical_representation.assign(&mut region, &self.values, 256);
->>>>>>> 7ee429c (remove rlc randomness)
                     Ok(())
                 },
             )

diff --git a/src/gadgets/mpt_update.rs b/src/gadgets/mpt_update.rs
@@ -9,9 +9,7 @@ use super::{
     is_zero::IsZeroGadget, key_bit::KeyBitLookup, one_hot::OneHot, poseidon::PoseidonLookup,
 };
 use crate::{
-    constraint_builder::{
-        AdviceColumn, BinaryQuery, ConstraintBuilder, Query, WordColumns,
-    },
+    constraint_builder::{AdviceColumn, BinaryQuery, ConstraintBuilder, Query, WordColumns},
     types::{
         storage::{StorageLeaf, StorageProof},
         trie::{next_domain, TrieRows},