Skip to content

Commit

Permalink
remove unnecessary proptest files
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberbono3 committed Dec 23, 2024
1 parent 5010b8c commit 77e68a8
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ specification/cheatsheet.log
specification/cheatsheet.synctex.gz
triton-vm/proofs/*

# Ignore proptest-regression processor file caused by bug
triton-air/proptest-regressions/table/processor.txt
triton-isa/proptest-regressions/op_stack.txt
# Ignore proptest-regression files caused by bug
triton-air/proptest-regressions/table/*
triton-isa/proptest-regressions/*
9 changes: 0 additions & 9 deletions triton-isa/proptest-regressions/op_stack.txt

This file was deleted.

4 changes: 2 additions & 2 deletions triton-isa/src/instruction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -834,8 +834,8 @@ pub enum InstructionError {
#[error("Triton VM has halted and cannot execute any further instructions")]
MachineHalted,

#[error(transparent)]
OpStackError(#[from] OpStackError),
#[error(transparent)]
OpStackError(#[from] OpStackError),
}

#[cfg(test)]
Expand Down
4 changes: 2 additions & 2 deletions triton-isa/src/op_stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ pub enum OpStackError {
#[error("failed to convert BFieldElement {0} into u32")]
FailedU32Conversion(BFieldElement),

#[error("index {0} is out of range for OpStack")]
IndexOutOfBounds(usize),
#[error("index {0} is out of range for OpStack")]
IndexOutOfBounds(usize),
}

impl OpStack {
Expand Down
15 changes: 7 additions & 8 deletions triton-isa/src/parser.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
#![allow(clippy::needless_lifetimes)]
#![allow(elided_named_lifetimes)]
use std::collections::hash_map::Entry;
use std::collections::HashMap;
use std::collections::HashSet;
use std::error::Error;
use std::fmt::Display;
use std::fmt::Formatter;
use std::fmt::Result as FmtResult;
use nom::branch::alt;
use nom::bytes::complete::tag;
use nom::bytes::complete::take_while;
Expand All @@ -23,6 +16,13 @@ use nom::multi::many0;
use nom::multi::many1;
use nom::Finish;
use nom::IResult;
use std::collections::hash_map::Entry;
use std::collections::HashMap;
use std::collections::HashSet;
use std::error::Error;
use std::fmt::Display;
use std::fmt::Formatter;
use std::fmt::Result as FmtResult;
use twenty_first::bfe;
use twenty_first::prelude::BFieldElement;

Expand All @@ -35,7 +35,6 @@ use crate::instruction::ALL_INSTRUCTION_NAMES;
use crate::op_stack::NumberOfWords;
use crate::op_stack::OpStackElement;


#[derive(Debug, PartialEq)]
pub struct ParseError<'a> {
pub input: &'a str,
Expand Down
2 changes: 1 addition & 1 deletion triton-vm/src/vm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ impl VMState {
Ok(vec![])
}

fn pick(&mut self, stack_register: OpStackElement) -> InstructionResult<Vec<CoProcessorCall>>{
fn pick(&mut self, stack_register: OpStackElement) -> InstructionResult<Vec<CoProcessorCall>> {
let element = self.op_stack.remove(stack_register)?;
self.op_stack.push(element);
self.instruction_pointer += 2;
Expand Down

0 comments on commit 77e68a8

Please sign in to comment.