fluencelabs/aquavm
1
0
Fork 0
mirror of https://github.com/fluencelabs/aquavm synced 2025-06-28 06:01:33 +00:00
Code Issues Projects Releases Wiki Activity

chore(trace-handler): sub/-trace len dedicated alias to replace usize [fixes VM-282] (#569)

Browse Source 
feat(trace-handler): sub/-trace len dedicated alias to replace usize [fixes VM-282]
This commit is contained in:
raftedproc
2023-05-02 16:32:18 +03:00
committed by GitHub
parent 80486ed6ad
commit b480e018b4
11 changed files with 150 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
crates/air-lib/trace-handler/src/data_keeper/trace_slider.rs
View File

@ -14,12 +14,16 @@
* limitations under the License.
*/
use air_interpreter_data::TraceLen;
use super::ExecutedState;
use super::ExecutionTrace;
use super::KeeperError::*;
use super::KeeperResult;
use crate::TracePos;
type SeenElements = u32;
/// This slider is intended to slide on a subtrace inside provided trace. This subtrace
/// is identified by position and len.
// TODO: check for overflow
@ -32,16 +36,16 @@ pub struct TraceSlider {
position: TracePos,
/// Length of a current subtrace.
subtrace_len: usize,
subtrace_len: TraceLen,
/// Count of seen elements since the last position update.
seen_elements: usize,
seen_elements: SeenElements,
}
impl TraceSlider {
pub(crate) fn new(trace: impl Into<ExecutionTrace>) -> Self {
let trace = trace.into();
let subtrace_len = trace.len();
let subtrace_len = trace.trace_states_count();
Self {
trace,
@ -54,7 +58,7 @@ impl TraceSlider {
/// and None otherwise.
#[allow(clippy::suspicious_operation_groupings)]
pub(crate) fn next_state(&mut self) -> Option<ExecutedState> {
if self.seen_elements >= self.subtrace_len || usize::from(self.position) >= self.trace.len() {
if self.seen_elements >= self.subtrace_len || self.position >= self.trace.trace_states_count().into() {
return None;
}
@ -64,14 +68,13 @@ impl TraceSlider {
Some(result)
}
pub(crate) fn set_position_and_len(&mut self, position: TracePos, subtrace_len: usize) -> KeeperResult<()> {
let pos: usize = position.into();
pub(crate) fn set_position_and_len(&mut self, position: TracePos, subtrace_len: TraceLen) -> KeeperResult<()> {
// it's possible to set empty subtrace_len and inconsistent position
if subtrace_len != 0 && pos + subtrace_len > self.trace.len() {
if subtrace_len != 0 && position + subtrace_len > self.trace.trace_states_count().into() {
return Err(SetSubtraceLenAndPosFailed {
requested_pos: position,
requested_subtrace_len: subtrace_len,
trace_len: self.trace.len(),
trace_len: self.trace.trace_states_count(),
});
}
@ -82,13 +85,13 @@ impl TraceSlider {
Ok(())
}
pub(crate) fn set_subtrace_len(&mut self, subtrace_len: usize) -> KeeperResult<()> {
let trace_remainder = self.trace.len() - usize::from(self.position);
pub(crate) fn set_subtrace_len(&mut self, subtrace_len: TraceLen) -> KeeperResult<()> {
let trace_remainder: TraceLen = (TracePos::from(self.trace_len()) - self.position).into();
if trace_remainder < subtrace_len {
return Err(SetSubtraceLenFailed {
requested_subtrace_len: subtrace_len,
trace_position: self.position,
trace_len: self.trace.len(),
trace_len: self.trace.trace_states_count(),
});
}
@ -102,7 +105,8 @@ impl TraceSlider {
self.position
}
pub(crate) fn subtrace_len(&self) -> usize {
pub(crate) fn subtrace_len(&self) -> TraceLen {
debug_assert!(self.subtrace_len >= self.seen_elements);
self.subtrace_len - self.seen_elements
}
@ -111,7 +115,7 @@ impl TraceSlider {
self.trace.get(position)
}
pub(super) fn trace_len(&self) -> usize {
self.trace.len()
pub(super) fn trace_len(&self) -> TraceLen {
self.trace.trace_states_count()
}
}