Skip to content

Commit

Permalink
Merge pull request #115 from 0xPolygonHermez/temporal-fix
Browse files Browse the repository at this point in the history
cargo update + remove .elf restriction in main_sm
  • Loading branch information
xavi-pinsach authored Oct 16, 2024
2 parents aabcdd0 + e59e8d3 commit ad59fe6
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 42 deletions.
77 changes: 39 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions state-machines/main/src/main_sm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ impl<'a, F: PrimeField> MainSM<F> {
arith_sm: Arc<ArithSM>,
) -> Arc<Self> {
// If rom_path has an .elf extension it must be converted to a ZisK ROM
let zisk_rom = if rom_path.extension().unwrap() == "elf" {
let zisk_rom = {
// Create an instance of the RISCV -> ZisK program converter
let rv2zk = Riscv2zisk::new(
rom_path.display().to_string(),
Expand All @@ -103,9 +103,6 @@ impl<'a, F: PrimeField> MainSM<F> {
panic!("Application error: {}", e);
}
}
} else {
// TODO - Remove this when the ZisK ROM is able to be loaded from a file
panic!("ROM file must be an ELF file");
};

// TODO - Compute MAX_ACCUMULATED having the num_rows of the Main AIR
Expand Down

0 comments on commit ad59fe6

Please sign in to comment.