cleanup

Author: z2trillion

aggregator/src/aggregation/circuit.rs

@@ -1,5 +1,4 @@
 use ark_std::{end_timer, start_timer};
-use eth_types::U256;
 use halo2_proofs::{
     circuit::{Layouter, SimpleFloorPlanner, Value},
     halo2curves::bn256::{Bn256, Fr, G1Affine},
@@ -249,13 +248,7 @@ impl<const N_SNARKS: usize> Circuit<Fr> for BatchCircuit<N_SNARKS> {
                     let barycentric = config.blob_consistency_config.assign_barycentric(
                         &mut ctx,
                         &self.batch_hash.blob_bytes,
-                        U256::from_big_endian(
-                            &self
-                                .batch_hash
-                                .blob_consistency_witness
-                                .challenge()
-                                .to_bytes(),
-                        ),
+                        self.batch_hash.blob_consistency_witness.challenge_digest(),
                     );
 
                     ctx.print_stats(&["barycentric"]);

aggregator/src/blob_consistency/eip4844.rs

@@ -188,8 +188,8 @@ impl BlobConsistencyWitness {
         self.blob_versioned_hash
     }
 
-    pub fn challenge_digest(&self) -> H256 {
-        self.challenge_digest
+    pub fn challenge_digest(&self) -> U256 {
+        word_from_digest(self.challenge_digest)
     }
 
     pub fn challenge(&self) -> Scalar {
@@ -228,4 +228,4 @@ fn word_from_digest(x: H256) -> U256 {
     U256::from_big_endian(&x.to_fixed_bytes())
 }
 
-// word_from scalar would not be used.
+// word_from_scalar would not be used.