Browse Source

fix nits

al-gkr-basic-workflow
Al-Kindi-0 2 years ago
parent
commit
4d108fe5e5
3 changed files with 9 additions and 9 deletions
  1. +4
    -6
      crypto/src/hash/mod.rs
  2. +4
    -1
      crypto/src/merkle/merkle_tree.rs
  3. +1
    -2
      crypto/src/merkle/mod.rs

+ 4
- 6
crypto/src/hash/mod.rs

@ -1,18 +1,16 @@
use winterfell::crypto::{ElementHasher};
use winterfell::math::StarkField;
use winterfell::crypto::Hasher as HashFn;
use winterfell::crypto::hashers::Rp64_256 as Hasher; use winterfell::crypto::hashers::Rp64_256 as Hasher;
use winterfell::crypto::ElementHasher;
use winterfell::crypto::Hasher as HashFn;
use winterfell::math::StarkField;
mod rpo; mod rpo;
pub use rpo::Rpo; pub use rpo::Rpo;
// TYPE ALIASES // TYPE ALIASES
// ================================================================================================ // ================================================================================================
pub type Digest = <Hasher as HashFn>::Digest; pub type Digest = <Hasher as HashFn>::Digest;
// HELPER FUNCTIONS // HELPER FUNCTIONS
// ================================================================================================ // ================================================================================================
@ -29,4 +27,4 @@ fn exp_acc(base: [B; N], tail: [B
#[inline(always)] #[inline(always)]
pub fn merge(values: &[Digest; 2]) -> Digest { pub fn merge(values: &[Digest; 2]) -> Digest {
Hasher::merge(values) Hasher::merge(values)
}
}

+ 4
- 1
crypto/src/merkle/merkle_tree.rs

@ -2,8 +2,11 @@ use core::slice;
use winter_utils::uninit_vector; use winter_utils::uninit_vector;
use winterfell::math::log2; use winterfell::math::log2;
use crate::{Felt, FieldElement, Word, hash::{merge,Digest}};
use super::MerkleError; use super::MerkleError;
use crate::{
hash::{merge, Digest},
Felt, FieldElement, Word,
};
// MERKLE TREE // MERKLE TREE
// ================================================================================================ // ================================================================================================

+ 1
- 2
crypto/src/merkle/mod.rs

@ -3,7 +3,6 @@ pub mod merkle_tree;
use crate::{Felt, FieldElement, Word}; use crate::{Felt, FieldElement, Word};
// ERRORS // ERRORS
// ================================================================================================ // ================================================================================================
@ -16,4 +15,4 @@ pub enum MerkleError {
InvalidDepth(u32, u32), InvalidDepth(u32, u32),
InvalidPath(Vec<Word>), InvalidPath(Vec<Word>),
NodeNotInSet(u64), NodeNotInSet(u64),
}
}

Loading…
Cancel
Save