Skip to content

Commit

Permalink
fix: nits
Browse files Browse the repository at this point in the history
  • Loading branch information
rpalakkal committed Feb 8, 2024
1 parent 1266eec commit bdd3b1f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions circuit/src/run/inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pub fn prove<P: JsonRpcClient + Clone, S: AxiomCircuitScaffold<P, Fr>>(
) -> Snark {
let circuit_params = RlcKeccakCircuitParams::from(pinning.params.clone());
let params = gen_srs(circuit_params.k() as u32);
let mut runner = AxiomCircuit::<_, _, S>::from_pinning(provider, pinning).use_inputs(inputs);
let mut runner = AxiomCircuit::<_, _, S>::prover(provider, pinning).use_inputs(inputs);
if circuit_params.keccak_rows_per_round > 0 {
runner.calculate_params();
}
Expand All @@ -100,8 +100,7 @@ pub fn run<P: JsonRpcClient + Clone, S: AxiomCircuitScaffold<P, Fr>>(
let circuit_params = RlcKeccakCircuitParams::from(pinning.params.clone());
let k = circuit_params.k();
let params = gen_srs(k as u32);
let mut runner =
AxiomCircuit::<_, _, S>::from_pinning(provider, pinning.clone()).use_inputs(inputs);
let mut runner = AxiomCircuit::<_, _, S>::prover(provider, pinning.clone()).use_inputs(inputs);
let output = runner.scaffold_output();
if circuit_params.keccak_rows_per_round > 0 {
runner.calculate_params();
Expand Down
8 changes: 4 additions & 4 deletions circuit/src/scaffold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ impl<F: Field, P: JsonRpcClient + Clone, A: AxiomCircuitScaffold<P, F>> AxiomCir
Self::from_stage(provider, circuit_params, CircuitBuilderStage::Mock)
}

pub fn from_pinning(provider: Provider<P>, pinning: AxiomCircuitPinning) -> Self {
pub fn prover(provider: Provider<P>, pinning: AxiomCircuitPinning) -> Self {
let mut circuit = Self::from_stage(provider, pinning.params, CircuitBuilderStage::Prover);
circuit.set_break_points(pinning.breakpoints);
circuit.set_break_points(pinning.break_points);
circuit
}

Expand Down Expand Up @@ -184,7 +184,7 @@ impl<F: Field, P: JsonRpcClient + Clone, A: AxiomCircuitScaffold<P, F>> AxiomCir

pub fn set_pinning(&mut self, pinning: AxiomCircuitPinning) {
self.set_params(pinning.params);
self.set_break_points(pinning.breakpoints);
self.set_break_points(pinning.break_points);
}

pub fn use_pinning(mut self, pinning: AxiomCircuitPinning) -> Self {
Expand Down Expand Up @@ -217,7 +217,7 @@ impl<F: Field, P: JsonRpcClient + Clone, A: AxiomCircuitScaffold<P, F>> AxiomCir
pub fn pinning(&self) -> AxiomCircuitPinning {
AxiomCircuitPinning {
params: self.params(),
breakpoints: self.break_points(),
break_points: self.break_points(),
}
}

Expand Down
2 changes: 1 addition & 1 deletion circuit/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl Default for AxiomCircuitParams {
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct AxiomCircuitPinning {
pub params: AxiomCircuitParams,
pub breakpoints: RlcThreadBreakPoints,
pub break_points: RlcThreadBreakPoints,
}

#[derive(Debug, Serialize, Clone, Default)]
Expand Down

0 comments on commit bdd3b1f

Please sign in to comment.