Skip to content

Commit

Permalink
🧹 Clean
Browse files Browse the repository at this point in the history
  • Loading branch information
clabby committed Sep 24, 2023
1 parent 355bb18 commit 2e00658
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
cache-on-failure: true
- name: cargo test
run: cargo test --all --all-features --release
run: cargo test --all --all-features
cargo-lint:
runs-on: ubuntu-latest
timeout-minutes: 20
Expand Down
2 changes: 1 addition & 1 deletion crates/mipsevm/src/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ impl Memory {

let left = self.merkleize_subtree(g_index << 1)?;
let right = self.merkleize_subtree((g_index << 1) | 1)?;
let result = keccak_concat_fixed(left.into(), right.into());
let result = keccak_concat_fixed(*left, *right);

self.nodes.insert(g_index, Some(result));

Expand Down
2 changes: 1 addition & 1 deletion crates/mipsevm/src/mips/instrumented.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub(crate) const MIPS_EINVAL: u32 = 0x16;
/// To perform an instruction step on the MIPS emulator, use the [InstrumentedState::step] method.
pub struct InstrumentedState<O: Write, E: Write, P: PreimageOracle> {
/// The inner [State] of the MIPS thread context.
pub(crate) state: State,
pub state: State,
/// The MIPS thread context's stdout buffer.
/// TODO(clabby): Prob not the best place for this.
pub(crate) std_out: BufWriter<O>,
Expand Down
2 changes: 0 additions & 2 deletions crates/mipsevm/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
use alloy_primitives::{keccak256, B256};

/// Concatenate two fixed sized arrays together into a new array with minimal reallocation.
#[inline(always)]
pub(crate) fn concat_fixed<T, const N: usize, const M: usize>(a: [T; N], b: [T; M]) -> [T; N + M]
where
T: Copy + Default,
Expand All @@ -16,7 +15,6 @@ where
}

/// Hash the concatenation of two fixed sized arrays.
#[inline(always)]
pub(crate) fn keccak_concat_fixed<T, const N: usize, const M: usize>(a: [T; N], b: [T; M]) -> B256
where
T: Copy + Default,
Expand Down

0 comments on commit 2e00658

Please sign in to comment.