cargo fix+fmt

eth-types/src/lib.rs

@@ -3,7 +3,7 @@
 #![feature(associated_type_defaults)]
 #![feature(generic_const_exprs)]
 mod spec;
-pub use spec::{Spec, Minimal, Testnet, Mainnet};
+pub use spec::{Mainnet, Minimal, Spec, Testnet};
 
 mod curve;
 pub use curve::{AppCurveExt, HashCurveExt};

lightclient-circuits/src/aggregation.rs

@@ -1,4 +1,7 @@
-use std::{env::{var, set_var}, iter};
+use std::{
+    env::{set_var, var},
+    iter,
+};
 
 use eth_types::Testnet;
 use halo2_base::{

lightclient-circuits/src/committee_update_circuit.rs

@@ -396,7 +396,7 @@ mod tests {
         // let instances =
         //     CommitteeUpdateCircuit::<Testnet, bn256::Fr>::instance(witness.pubkeys_compressed);
         // let num_instances = instances[0].len();
-        
+
         let instances = agg_circuit.instances();
         let num_instances = agg_circuit.num_instance();
 

lightclient-circuits/src/gadget/crypto/builder.rs

@@ -4,8 +4,8 @@ use eth_types::Field;
 use halo2_base::{
     gates::{
         builder::{
-            assign_threads_in, FlexGateConfigParams, KeygenAssignments,
-            MultiPhaseThreadBreakPoints, ThreadBreakPoints, CircuitBuilderStage,
+            assign_threads_in, CircuitBuilderStage, FlexGateConfigParams, KeygenAssignments,
+            MultiPhaseThreadBreakPoints, ThreadBreakPoints,
         },
         range::{RangeConfig, RangeStrategy},
     },
@@ -65,8 +65,15 @@ impl<F: Field, ThreadBuilder: ThreadBuilderBase<F>> ShaCircuitBuilder<F, ThreadB
         }
     }
 
-    pub fn from_stage(builder: ThreadBuilder, break_points: Option<MultiPhaseThreadBreakPoints>, stage: CircuitBuilderStage) -> Self {
-        Self::new(builder.unknown(stage == CircuitBuilderStage::Keygen), break_points)
+    pub fn from_stage(
+        builder: ThreadBuilder,
+        break_points: Option<MultiPhaseThreadBreakPoints>,
+        stage: CircuitBuilderStage,
+    ) -> Self {
+        Self::new(
+            builder.unknown(stage == CircuitBuilderStage::Keygen),
+            break_points,
+        )
     }
 
     /// Creates a new [ShaCircuitBuilder] with `use_unknown` of [ShaThreadBuilder] set to true.
@@ -77,7 +84,6 @@ impl<F: Field, ThreadBuilder: ThreadBuilderBase<F>> ShaCircuitBuilder<F, ThreadB
     /// Creates a new [ShaCircuitBuilder] with `use_unknown` of [GateThreadBuilder] set to false.
     pub fn mock(builder: ThreadBuilder) -> Self {
         Self::new(builder.unknown(false), None)
-
     }
 
     /// Creates a new [ShaCircuitBuilder].

lightclient-circuits/src/gadget/crypto/sha256_flex/builder.rs

@@ -49,7 +49,8 @@ impl<F: Field> ThreadBuilderBase<F> for ShaThreadBuilder<F> {
     }
 
     fn from_stage(stage: CircuitBuilderStage) -> Self {
-        Self::new(stage == CircuitBuilderStage::Prover).unknown(stage == CircuitBuilderStage::Keygen)
+        Self::new(stage == CircuitBuilderStage::Prover)
+            .unknown(stage == CircuitBuilderStage::Keygen)
     }
 
     fn unknown(mut self, use_unknown: bool) -> Self {

lightclient-circuits/src/gadget/crypto/sha256_wide/builder.rs

@@ -77,7 +77,8 @@ impl<F: Field> ThreadBuilderBase<F> for ShaBitThreadBuilder<F> {
     }
 
     fn from_stage(stage: CircuitBuilderStage) -> Self {
-        Self::new(stage == CircuitBuilderStage::Prover).unknown(stage == CircuitBuilderStage::Keygen)
+        Self::new(stage == CircuitBuilderStage::Prover)
+            .unknown(stage == CircuitBuilderStage::Keygen)
     }
 
     fn unknown(mut self, use_unknown: bool) -> Self {

lightclient-circuits/src/lib.rs

@@ -13,9 +13,9 @@ pub mod gadget;
 pub mod util;
 pub mod witness;
 
+pub mod aggregation;
 pub mod committee_update_circuit;
 pub mod sync_step_circuit;
-pub mod aggregation;
 
 mod builder;
 mod poseidon;

lightclient-circuits/src/sync_step_circuit.rs

@@ -266,10 +266,7 @@ impl<S: Spec, F: Field> SyncStepCircuit<S, F> {
 
         let h = sha256_chip.digest::<64>(
             thread_pool,
-            HashInput::TwoToOne(
-                h.output_bytes.into(),
-                participation_sum_bytes.into(),
-            ),
+            HashInput::TwoToOne(h.output_bytes.into(), participation_sum_bytes.into()),
             false,
         )?;
 

lightclient-circuits/src/util.rs

@@ -5,7 +5,6 @@ pub use common::*;
 
 use std::{cell::RefCell, path::Path, rc::Rc};
 
-
 mod constraint_builder;
 pub(crate) use constraint_builder::*;
 

lightclient-circuits/src/util/common.rs

@@ -2,7 +2,10 @@ use crate::gadget::Expr;
 use eth_types::*;
 use halo2_base::{
     gates::{
-        builder::{FlexGateConfigParams, KeygenAssignments, MultiPhaseThreadBreakPoints, CircuitBuilderStage},
+        builder::{
+            CircuitBuilderStage, FlexGateConfigParams, KeygenAssignments,
+            MultiPhaseThreadBreakPoints,
+        },
         flex_gate::FlexGateConfig,
     },
     Context,

prover/src/args.rs

@@ -24,7 +24,7 @@ pub struct Args {
     pub out: Out,
 
     #[clap(long, short)]
-    pub k: Option<u32>, 
+    pub k: Option<u32>,
 
     #[clap(
         long,
@@ -39,14 +39,18 @@ pub struct Args {
     #[clap(long, short)]
     pub input_path: Option<PathBuf>,
 
-    #[clap(long, short, help = "Beacon node URL", default_value = "http://localhost::5052")]
+    #[clap(
+        long,
+        short,
+        help = "Beacon node URL",
+        default_value = "http://localhost::5052"
+    )]
     pub node_url: String,
 
     #[clap(index = 1, help = "path to output", default_value = ".")]
     pub path_out: PathBuf,
 }
 
-
 #[derive(Clone, clap::Args)]
 pub struct AggregationArgs {
     #[clap(flatten)]