From a8a06e7a83e4ad2ba2cf743de5157a36f549e5c3 Mon Sep 17 00:00:00 2001 From: Timofey Luin Date: Thu, 21 Sep 2023 15:27:04 +0200 Subject: [PATCH] cargo fix+fmt --- eth-types/src/lib.rs | 2 +- lightclient-circuits/src/aggregation.rs | 5 ++++- .../src/committee_update_circuit.rs | 2 +- .../src/gadget/crypto/builder.rs | 16 +++++++++++----- .../src/gadget/crypto/sha256_flex/builder.rs | 3 ++- .../src/gadget/crypto/sha256_wide/builder.rs | 3 ++- lightclient-circuits/src/lib.rs | 2 +- lightclient-circuits/src/sync_step_circuit.rs | 5 +---- lightclient-circuits/src/util.rs | 1 - lightclient-circuits/src/util/common.rs | 5 ++++- prover/src/args.rs | 10 +++++++--- 11 files changed, 34 insertions(+), 20 deletions(-) diff --git a/eth-types/src/lib.rs b/eth-types/src/lib.rs index b2ce08e7..297afd5c 100644 --- a/eth-types/src/lib.rs +++ b/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}; diff --git a/lightclient-circuits/src/aggregation.rs b/lightclient-circuits/src/aggregation.rs index 5ffcfc3c..0e2ffc11 100644 --- a/lightclient-circuits/src/aggregation.rs +++ b/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::{ diff --git a/lightclient-circuits/src/committee_update_circuit.rs b/lightclient-circuits/src/committee_update_circuit.rs index 44d6cd1e..d7cdfa8e 100644 --- a/lightclient-circuits/src/committee_update_circuit.rs +++ b/lightclient-circuits/src/committee_update_circuit.rs @@ -396,7 +396,7 @@ mod tests { // let instances = // CommitteeUpdateCircuit::::instance(witness.pubkeys_compressed); // let num_instances = instances[0].len(); - + let instances = agg_circuit.instances(); let num_instances = agg_circuit.num_instance(); diff --git a/lightclient-circuits/src/gadget/crypto/builder.rs b/lightclient-circuits/src/gadget/crypto/builder.rs index 977b5b74..d0177c35 100644 --- a/lightclient-circuits/src/gadget/crypto/builder.rs +++ b/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> ShaCircuitBuilder, stage: CircuitBuilderStage) -> Self { - Self::new(builder.unknown(stage == CircuitBuilderStage::Keygen), break_points) + pub fn from_stage( + builder: ThreadBuilder, + break_points: Option, + 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> ShaCircuitBuilder Self { Self::new(builder.unknown(false), None) - } /// Creates a new [ShaCircuitBuilder]. diff --git a/lightclient-circuits/src/gadget/crypto/sha256_flex/builder.rs b/lightclient-circuits/src/gadget/crypto/sha256_flex/builder.rs index 3f79ad58..63f42b80 100644 --- a/lightclient-circuits/src/gadget/crypto/sha256_flex/builder.rs +++ b/lightclient-circuits/src/gadget/crypto/sha256_flex/builder.rs @@ -49,7 +49,8 @@ impl ThreadBuilderBase for ShaThreadBuilder { } 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 { diff --git a/lightclient-circuits/src/gadget/crypto/sha256_wide/builder.rs b/lightclient-circuits/src/gadget/crypto/sha256_wide/builder.rs index d00072a1..0c2ab342 100644 --- a/lightclient-circuits/src/gadget/crypto/sha256_wide/builder.rs +++ b/lightclient-circuits/src/gadget/crypto/sha256_wide/builder.rs @@ -77,7 +77,8 @@ impl ThreadBuilderBase for ShaBitThreadBuilder { } 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 { diff --git a/lightclient-circuits/src/lib.rs b/lightclient-circuits/src/lib.rs index a8256ef5..7f28bda7 100644 --- a/lightclient-circuits/src/lib.rs +++ b/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; diff --git a/lightclient-circuits/src/sync_step_circuit.rs b/lightclient-circuits/src/sync_step_circuit.rs index e9da2b7b..722e61f0 100644 --- a/lightclient-circuits/src/sync_step_circuit.rs +++ b/lightclient-circuits/src/sync_step_circuit.rs @@ -266,10 +266,7 @@ impl SyncStepCircuit { 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, )?; diff --git a/lightclient-circuits/src/util.rs b/lightclient-circuits/src/util.rs index 0c610639..8aad7296 100644 --- a/lightclient-circuits/src/util.rs +++ b/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::*; diff --git a/lightclient-circuits/src/util/common.rs b/lightclient-circuits/src/util/common.rs index cdaa6399..ecb26592 100644 --- a/lightclient-circuits/src/util/common.rs +++ b/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, diff --git a/prover/src/args.rs b/prover/src/args.rs index 6d628e63..bdbf2bc2 100644 --- a/prover/src/args.rs +++ b/prover/src/args.rs @@ -24,7 +24,7 @@ pub struct Args { pub out: Out, #[clap(long, short)] - pub k: Option, + pub k: Option, #[clap( long, @@ -39,14 +39,18 @@ pub struct Args { #[clap(long, short)] pub input_path: Option, - #[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)]