diff --git a/crypto/src/hash/mod.rs b/crypto/src/hash/mod.rs index 6be9cfb..a051c28 100644 --- a/crypto/src/hash/mod.rs +++ b/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::ElementHasher; +use winterfell::crypto::Hasher as HashFn; +use winterfell::math::StarkField; mod rpo; pub use rpo::Rpo; - // TYPE ALIASES // ================================================================================================ pub type Digest = ::Digest; - // HELPER FUNCTIONS // ================================================================================================ @@ -29,4 +27,4 @@ fn exp_acc(base: [B; N], tail: [B #[inline(always)] pub fn merge(values: &[Digest; 2]) -> Digest { Hasher::merge(values) -} \ No newline at end of file +} diff --git a/crypto/src/merkle/merkle_tree.rs b/crypto/src/merkle/merkle_tree.rs index daa289b..bbe976b 100644 --- a/crypto/src/merkle/merkle_tree.rs +++ b/crypto/src/merkle/merkle_tree.rs @@ -2,8 +2,11 @@ use core::slice; use winter_utils::uninit_vector; use winterfell::math::log2; -use crate::{Felt, FieldElement, Word, hash::{merge,Digest}}; use super::MerkleError; +use crate::{ + hash::{merge, Digest}, + Felt, FieldElement, Word, +}; // MERKLE TREE // ================================================================================================ diff --git a/crypto/src/merkle/mod.rs b/crypto/src/merkle/mod.rs index 9851c2a..3ab61e8 100644 --- a/crypto/src/merkle/mod.rs +++ b/crypto/src/merkle/mod.rs @@ -3,7 +3,6 @@ pub mod merkle_tree; use crate::{Felt, FieldElement, Word}; - // ERRORS // ================================================================================================ @@ -16,4 +15,4 @@ pub enum MerkleError { InvalidDepth(u32, u32), InvalidPath(Vec), NodeNotInSet(u64), -} \ No newline at end of file +}