diff --git a/README.md b/README.md index 137e9ad8a..ffc1c5d9d 100644 --- a/README.md +++ b/README.md @@ -269,7 +269,7 @@ impl Prover for WorkProver { // Our public inputs consist of the first and last value in the execution trace. fn get_pub_inputs(&self, trace: &Self::Trace) -> PublicInputs { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; PublicInputs { start: trace.get(0, 0), result: trace.get(0, last_step), diff --git a/examples/src/fibonacci/fib2/mod.rs b/examples/src/fibonacci/fib2/mod.rs index 46e3ff7ff..c97ef8fde 100644 --- a/examples/src/fibonacci/fib2/mod.rs +++ b/examples/src/fibonacci/fib2/mod.rs @@ -101,7 +101,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(self.sequence_length); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/fibonacci/fib2/prover.rs b/examples/src/fibonacci/fib2/prover.rs index bb818de30..83e089efb 100644 --- a/examples/src/fibonacci/fib2/prover.rs +++ b/examples/src/fibonacci/fib2/prover.rs @@ -64,7 +64,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> BaseElement { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; trace.get(1, last_step) } diff --git a/examples/src/fibonacci/fib8/mod.rs b/examples/src/fibonacci/fib8/mod.rs index 74b17f59f..866c4a084 100644 --- a/examples/src/fibonacci/fib8/mod.rs +++ b/examples/src/fibonacci/fib8/mod.rs @@ -101,7 +101,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(self.sequence_length); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/fibonacci/fib8/prover.rs b/examples/src/fibonacci/fib8/prover.rs index dd65ecd45..026bef3db 100644 --- a/examples/src/fibonacci/fib8/prover.rs +++ b/examples/src/fibonacci/fib8/prover.rs @@ -79,7 +79,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> BaseElement { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; trace.get(1, last_step) } diff --git a/examples/src/fibonacci/fib_small/mod.rs b/examples/src/fibonacci/fib_small/mod.rs index c6a37b1cf..5b149a42f 100644 --- a/examples/src/fibonacci/fib_small/mod.rs +++ b/examples/src/fibonacci/fib_small/mod.rs @@ -116,7 +116,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(self.sequence_length); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/fibonacci/fib_small/prover.rs b/examples/src/fibonacci/fib_small/prover.rs index 489aa5e3d..af0a6b40d 100644 --- a/examples/src/fibonacci/fib_small/prover.rs +++ b/examples/src/fibonacci/fib_small/prover.rs @@ -63,7 +63,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> BaseElement { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; trace.get(1, last_step) } diff --git a/examples/src/fibonacci/mulfib2/mod.rs b/examples/src/fibonacci/mulfib2/mod.rs index 2c02ea047..8abf025dc 100644 --- a/examples/src/fibonacci/mulfib2/mod.rs +++ b/examples/src/fibonacci/mulfib2/mod.rs @@ -101,7 +101,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(sequence_length); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/fibonacci/mulfib2/prover.rs b/examples/src/fibonacci/mulfib2/prover.rs index cc4023623..b68e18cd7 100644 --- a/examples/src/fibonacci/mulfib2/prover.rs +++ b/examples/src/fibonacci/mulfib2/prover.rs @@ -60,7 +60,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> BaseElement { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; trace.get(0, last_step) } diff --git a/examples/src/fibonacci/mulfib8/mod.rs b/examples/src/fibonacci/mulfib8/mod.rs index 19b5ae2fe..b9763761a 100644 --- a/examples/src/fibonacci/mulfib8/mod.rs +++ b/examples/src/fibonacci/mulfib8/mod.rs @@ -102,7 +102,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(sequence_length); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/fibonacci/mulfib8/prover.rs b/examples/src/fibonacci/mulfib8/prover.rs index a3d322ce9..744e71f91 100644 --- a/examples/src/fibonacci/mulfib8/prover.rs +++ b/examples/src/fibonacci/mulfib8/prover.rs @@ -72,7 +72,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> BaseElement { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; trace.get(6, last_step) } diff --git a/examples/src/lamport/aggregate/mod.rs b/examples/src/lamport/aggregate/mod.rs index b8029274a..765c4896d 100644 --- a/examples/src/lamport/aggregate/mod.rs +++ b/examples/src/lamport/aggregate/mod.rs @@ -127,7 +127,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(&self.messages, &self.signatures); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/lamport/threshold/mod.rs b/examples/src/lamport/threshold/mod.rs index 974629af2..092433f07 100644 --- a/examples/src/lamport/threshold/mod.rs +++ b/examples/src/lamport/threshold/mod.rs @@ -133,7 +133,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(&self.pub_key, self.message, &self.signatures); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/merkle/mod.rs b/examples/src/merkle/mod.rs index 0b6149a8f..d99d0dd78 100644 --- a/examples/src/merkle/mod.rs +++ b/examples/src/merkle/mod.rs @@ -121,7 +121,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(self.value, &self.path, self.index); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/merkle/prover.rs b/examples/src/merkle/prover.rs index 619c9f9d8..d4dae42d2 100644 --- a/examples/src/merkle/prover.rs +++ b/examples/src/merkle/prover.rs @@ -113,7 +113,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> PublicInputs { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; PublicInputs { tree_root: [trace.get(0, last_step), trace.get(1, last_step)], } diff --git a/examples/src/rescue/mod.rs b/examples/src/rescue/mod.rs index fe7af67f2..9f79fec96 100644 --- a/examples/src/rescue/mod.rs +++ b/examples/src/rescue/mod.rs @@ -106,7 +106,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(self.seed, self.chain_length); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/rescue/prover.rs b/examples/src/rescue/prover.rs index b04ee28bf..4d2599062 100644 --- a/examples/src/rescue/prover.rs +++ b/examples/src/rescue/prover.rs @@ -79,7 +79,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> PublicInputs { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; PublicInputs { seed: [trace.get(0, 0), trace.get(1, 0)], result: [trace.get(0, last_step), trace.get(1, last_step)], diff --git a/examples/src/rescue_raps/mod.rs b/examples/src/rescue_raps/mod.rs index e41a65c7a..33828eca1 100644 --- a/examples/src/rescue_raps/mod.rs +++ b/examples/src/rescue_raps/mod.rs @@ -119,7 +119,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = prover.build_trace(&self.seeds, &self.permuted_seeds, self.result); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/rescue_raps/prover.rs b/examples/src/rescue_raps/prover.rs index b32196668..021f02319 100644 --- a/examples/src/rescue_raps/prover.rs +++ b/examples/src/rescue_raps/prover.rs @@ -107,7 +107,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> PublicInputs { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; PublicInputs { result: [ [trace.get(0, last_step), trace.get(1, last_step)], diff --git a/examples/src/utils/mod.rs b/examples/src/utils/mod.rs index a3d9283ee..3fecfa6e9 100644 --- a/examples/src/utils/mod.rs +++ b/examples/src/utils/mod.rs @@ -67,7 +67,7 @@ pub fn print_trace( let trace_width = trace.width(); let mut state = vec![E::ZERO; trace_width]; - for i in 0..trace.info().length() { + for i in 0..trace.length() { if (i.wrapping_sub(offset)) % multiples_of != 0 { continue; } diff --git a/examples/src/vdf/exempt/mod.rs b/examples/src/vdf/exempt/mod.rs index 3b847d81e..66bef4f22 100644 --- a/examples/src/vdf/exempt/mod.rs +++ b/examples/src/vdf/exempt/mod.rs @@ -97,7 +97,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = VdfProver::::build_trace(self.seed, self.num_steps + 1); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/vdf/exempt/prover.rs b/examples/src/vdf/exempt/prover.rs index 2c1e81278..9a83ff501 100644 --- a/examples/src/vdf/exempt/prover.rs +++ b/examples/src/vdf/exempt/prover.rs @@ -62,7 +62,7 @@ where fn get_pub_inputs(&self, trace: &Self::Trace) -> VdfInputs { // the result is read from the second to last step because the last last step contains // garbage - let second_to_last_step = trace.info().length() - 2; + let second_to_last_step = trace.length() - 2; VdfInputs { seed: trace.get(0, 0), result: trace.get(0, second_to_last_step), diff --git a/examples/src/vdf/regular/mod.rs b/examples/src/vdf/regular/mod.rs index 4402dca22..8b8ffb08c 100644 --- a/examples/src/vdf/regular/mod.rs +++ b/examples/src/vdf/regular/mod.rs @@ -94,7 +94,7 @@ where info_span!("generate_execution_trace", num_cols = TRACE_WIDTH, steps = field::Empty) .in_scope(|| { let trace = VdfProver::::build_trace(self.seed, self.num_steps); - tracing::Span::current().record("steps", trace.info().length()); + tracing::Span::current().record("steps", trace.length()); trace }); diff --git a/examples/src/vdf/regular/prover.rs b/examples/src/vdf/regular/prover.rs index f794c620b..e899ec3be 100644 --- a/examples/src/vdf/regular/prover.rs +++ b/examples/src/vdf/regular/prover.rs @@ -57,7 +57,7 @@ where DefaultConstraintEvaluator<'a, Self::Air, E>; fn get_pub_inputs(&self, trace: &Self::Trace) -> VdfInputs { - let last_step = trace.info().length() - 1; + let last_step = trace.length() - 1; VdfInputs { seed: trace.get(0, 0), result: trace.get(0, last_step), diff --git a/prover/src/trace/mod.rs b/prover/src/trace/mod.rs index 1d1ee63bb..511e8fa0b 100644 --- a/prover/src/trace/mod.rs +++ b/prover/src/trace/mod.rs @@ -98,7 +98,7 @@ pub trait Trace: Sized { // first, check assertions against the main segment of the execution trace for assertion in air.get_assertions() { - assertion.apply(self.info().length(), |step, value| { + assertion.apply(self.length(), |step, value| { assert!( value == self.main_segment().get(assertion.column(), step), "trace does not satisfy assertion main_trace({}, {}) == {}", @@ -125,7 +125,7 @@ pub trait Trace: Sized { } // get the matrix and verify the assertion against it - assertion.apply(self.info().length(), |step, value| { + assertion.apply(self.length(), |step, value| { assert!( value == aux_segments[segment_idx].get(column_idx, step), "trace does not satisfy assertion aux_trace({}, {}) == {}", @@ -157,7 +157,7 @@ pub trait Trace: Sized { // we check transition constraints on all steps except the last k steps, where k is the // number of steps exempt from transition constraints (guaranteed to be at least 1) - for step in 0..self.info().length() - air.context().num_transition_exemptions() { + for step in 0..self.length() - air.context().num_transition_exemptions() { // build periodic values for (p, v) in periodic_values_polys.iter().zip(periodic_values.iter_mut()) { let num_cycles = air.trace_length() / p.len(); diff --git a/prover/src/trace/tests.rs b/prover/src/trace/tests.rs index 9102aaac2..71665f592 100644 --- a/prover/src/trace/tests.rs +++ b/prover/src/trace/tests.rs @@ -13,7 +13,7 @@ fn new_trace_table() { let trace = build_fib_trace(trace_length * 2); assert_eq!(2, trace.info().main_trace_width()); - assert_eq!(8, trace.info().length()); + assert_eq!(8, trace.length()); let expected: Vec = vec![1u32, 2, 5, 13, 34, 89, 233, 610] .into_iter() diff --git a/winterfell/src/lib.rs b/winterfell/src/lib.rs index 4740984dd..804e3db25 100644 --- a/winterfell/src/lib.rs +++ b/winterfell/src/lib.rs @@ -349,7 +349,7 @@ //! //! // Our public inputs consist of the first and last value in the execution trace. //! fn get_pub_inputs(&self, trace: &Self::Trace) -> PublicInputs { -//! let last_step = trace.info().length() - 1; +//! let last_step = trace.length() - 1; //! PublicInputs { //! start: trace.get(0, 0), //! result: trace.get(0, last_step), @@ -488,7 +488,7 @@ //! # DefaultConstraintEvaluator<'a, Self::Air, E>; //! # //! # fn get_pub_inputs(&self, trace: &Self::Trace) -> PublicInputs { -//! # let last_step = trace.info().length() - 1; +//! # let last_step = trace.length() - 1; //! # PublicInputs { //! # start: trace.get(0, 0), //! # result: trace.get(0, last_step),