qyriad/miden-crypto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: misc. nits

Browse source
This commit is contained in:
Al-Kindi-0 2022-10-20 08:51:54 +02:00
parent 4d108fe5e5
commit 32af9aaed2
5 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crypto/Cargo.toml
View file

@ -13,8 +13,7 @@ edition = "2021"
[dependencies] [dependencies]
winterfell = { git = "https://github.com/novifinancial/winterfell"} winterfell = { git = "https://github.com/novifinancial/winterfell"}
winter_utils = { version = "0.4", package = "winter-utils" } winter_utils = { version = "0.4", package = "winter-utils" }
rand_utils = { version = "0.4", package = "winter-rand-utils" }
[dev-dependencies] [dev-dependencies]
proptest = "1.0.0" proptest = "1.0.0"
rand_utils = { version = "0.4", package = "winter-rand-utils" }

10
crypto/src/hash/mod.rs
View file

@ -1,10 +1,6 @@
use winterfell::crypto::hashers::Rp64_256 as Hasher; use crate::StarkField;
use winterfell::crypto::ElementHasher; pub use winterfell::crypto::hashers::Rp64_256 as Hasher;
use winterfell::crypto::Hasher as HashFn; pub use winterfell::crypto::{ElementHasher, Hasher as HashFn};
use winterfell::math::StarkField;
mod rpo;
pub use rpo::Rpo;
// TYPE ALIASES // TYPE ALIASES
// ================================================================================================ // ================================================================================================

7
crypto/src/merkle/merkle_path_set.rs
View file

@ -1,7 +1,6 @@
use winter_utils::collections::BTreeMap;
use super::{Felt, FieldElement, MerkleError, Word}; use super::{Felt, FieldElement, MerkleError, Word};
use crate::hash::merge; use crate::hash::merge;
use winter_utils::collections::{BTreeMap, Vec};
// MERKLE PATH SET // MERKLE PATH SET
// ================================================================================================ // ================================================================================================
@ -255,9 +254,7 @@ fn compute_path_root(path: &[Word], depth: u32, index: u64) -> Word {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::calculate_parent_hash; use super::{calculate_parent_hash, Felt, FieldElement, Word};
use super::{Felt, FieldElement, Word};
#[test] #[test]
fn get_root() { fn get_root() {

15
crypto/src/merkle/merkle_tree.rs
View file

@ -1,12 +1,11 @@
use core::slice;
use winter_utils::uninit_vector;
use winterfell::math::log2;
use super::MerkleError; use super::MerkleError;
use crate::{ use crate::{
hash::{merge, Digest}, hash::{merge, Digest},
Felt, FieldElement, Word, Felt, FieldElement, Word,
}; };
use core::slice;
use winter_utils::uninit_vector;
use winterfell::math::log2;
// MERKLE TREE // MERKLE TREE
// ================================================================================================ // ================================================================================================
@ -147,7 +146,7 @@ impl MerkleTree {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{Felt, FieldElement, Word}; use super::{Felt, FieldElement, Word};
use winterfell::crypto::{hashers::Rp64_256, ElementHasher, Hasher}; use crate::hash::{ElementHasher, HashFn, Hasher};
const LEAVES4: [Word; 4] = [ const LEAVES4: [Word; 4] = [
int_to_node(1), int_to_node(1),
@ -248,9 +247,9 @@ mod tests {
// -------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------
fn compute_internal_nodes() -> (Word, Word, Word) { fn compute_internal_nodes() -> (Word, Word, Word) {
let node2 = Rp64_256::hash_elements(&[LEAVES4[0], LEAVES4[1]].concat()); let node2 = Hasher::hash_elements(&[LEAVES4[0], LEAVES4[1]].concat());
let node3 = Rp64_256::hash_elements(&[LEAVES4[2], LEAVES4[3]].concat()); let node3 = Hasher::hash_elements(&[LEAVES4[2], LEAVES4[3]].concat());
let root = Rp64_256::merge(&[node2, node3]); let root = Hasher::merge(&[node2, node3]);
(root.into(), node2.into(), node3.into()) (root.into(), node2.into(), node3.into())
} }

4
crypto/src/merkle/mod.rs
View file

@ -1,8 +1,8 @@
use crate::{Felt, FieldElement, Word};
pub mod merkle_path_set; pub mod merkle_path_set;
pub mod merkle_tree; pub mod merkle_tree;
use crate::{Felt, FieldElement, Word};
// ERRORS // ERRORS
// ================================================================================================ // ================================================================================================