fix: Pay #925 tech debt

privacy-scaling-explorations · Nov 30, 2022 · 1abe872 · 1abe872
1 parent c74c1ed
commit 1abe872
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/zkevm-circuits/src/keccak_circuit/keccak_packed_multi.rs b/zkevm-circuits/src/keccak_circuit/keccak_packed_multi.rs
@@ -1,6 +1,6 @@
 use super::util::{
-    get_num_bits_per_lookup, load_lookup_table, load_normalize_table, load_pack_table,
-    CHI_BASE_LOOKUP_TABLE, NUM_ROUNDS,
+    extract_field, get_num_bits_per_lookup, load_lookup_table, load_normalize_table,
+    load_pack_table, CHI_BASE_LOOKUP_TABLE, NUM_ROUNDS,
 };
 use crate::evm_circuit::util::{not, rlc};
 use crate::keccak_circuit::util::{
@@ -187,11 +187,7 @@ impl<F: FieldExt> Cell<F> {
         // API customized for this impl specifically, for now I'm opening the
         // value and extracting it. Once https://github.com/privacy-scaling-explorations/zkevm-circuits/issues/933 is resolved,
         // this shouldn't be needed.
-        let mut value_f = F::zero();
-        value.map(|f| {
-            value_f = f;
-            f
-        });
+        let value_f = extract_field(value);
 
         region.assign(
             self.column_idx,

diff --git a/zkevm-circuits/src/keccak_circuit/util.rs b/zkevm-circuits/src/keccak_circuit/util.rs
@@ -3,6 +3,7 @@
 use eth_types::{Field, ToScalar, Word};
 use halo2_proofs::{
     circuit::{Layouter, Value},
+    halo2curves::FieldExt,
     plonk::{Error, TableColumn},
 };
 use itertools::Itertools;
@@ -453,7 +454,7 @@ pub fn load_lookup_table<F: Field>(
     )
 }
 
-pub(crate) fn extract_field<F: Field>(value: Value<F>) -> F {
+pub(crate) fn extract_field<F: FieldExt>(value: Value<F>) -> F {
     let mut field = F::zero();
     let _ = value.map(|f| {
         field = f;