zec
/
incrementalmerkletree
mirror of https://github.com/zcash/incrementalmerkletree.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consolidate bridgetree tests.

This commit is contained in:
Kris Nuttycombe 2022-12-14 19:39:10 -07:00
parent 4e2883c707
commit 50779d2bd5
2 changed files with 55 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
bridgetree/src/lib.rs
View File

@ -30,9 +30,6 @@
//! reset the state to.
//!
//! In this module, the term "ommer" is used as for the sibling of a parent node in a binary tree.
#[cfg(any(bench, test, feature = "test-dependencies"))]
pub mod testing;
use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet};
use std::convert::TryFrom;
@ -1297,11 +1294,17 @@ impl<H: Hashable + Ord + Clone, const DEPTH: u8> BridgeTree<H, DEPTH> {
#[cfg(test)]
mod tests {
use proptest::prelude::*;
use std::fmt::Debug;
use super::*;
use incrementalmerkletree::testing::{
apply_operation, arb_operation, check_checkpoint_rewind, check_rewind_remove_mark,
check_root_hashes, check_witnesses, Frontier, Tree,
use incrementalmerkletree::{
testing::{
apply_operation, arb_operation, check_checkpoint_rewind, check_operations,
check_rewind_remove_mark, check_rewind_remove_mark_consistency, check_root_hashes,
check_witnesses, complete_tree::CompleteTree, CombinedTree, Frontier, SipHashable,
Tree,
},
Hashable,
};
impl<H: Hashable + Clone, const DEPTH: u8> Frontier<H> for super::Frontier<H, DEPTH> {
@ -1616,4 +1619,50 @@ mod tests {
tree.rewind();
assert!(tree.root(0) != empty_root);
}
// Combined tree tests
fn new_combined_tree<H: Hashable + Ord + Clone + Debug>(
max_checkpoints: usize,
) -> CombinedTree<H, CompleteTree<H>, BridgeTree<H, 4>> {
CombinedTree::new(
CompleteTree::new(4, max_checkpoints),
BridgeTree::<H, 4>::new(max_checkpoints),
)
}
#[test]
fn test_rewind_remove_mark() {
check_rewind_remove_mark(new_combined_tree);
}
#[test]
fn test_rewind_remove_mark_consistency() {
check_rewind_remove_mark_consistency(new_combined_tree);
}
proptest! {
#![proptest_config(ProptestConfig::with_cases(100000))]
#[test]
fn check_randomized_u64_ops(
ops in proptest::collection::vec(
arb_operation((0..32u64).prop_map(SipHashable), 0usize..100),
1..100
)
) {
let tree = new_combined_tree(100);
check_operations(tree, 4, &ops)?;
}
#[test]
fn check_randomized_str_ops(
ops in proptest::collection::vec(
arb_operation((97u8..123).prop_map(|c| char::from(c).to_string()), 0usize..100),
1..100
)
) {
let tree = new_combined_tree(100);
check_operations(tree, 4, &ops)?;
}
}
}

60
bridgetree/src/testing.rs
View File

@ -1,60 +0,0 @@
#[cfg(test)]
pub(crate) mod tests {
use proptest::prelude::*;
use std::fmt::Debug;
use crate::BridgeTree;
use incrementalmerkletree::{
testing::{
arb_operation, check_operations, check_rewind_remove_mark,
check_rewind_remove_mark_consistency, complete_tree::CompleteTree, CombinedTree,
SipHashable,
},
Hashable,
};
fn new_combined_tree<H: Hashable + Ord + Clone + Debug>(
max_checkpoints: usize,
) -> CombinedTree<H, CompleteTree<H>, BridgeTree<H, 4>> {
CombinedTree::new(
CompleteTree::new(4, max_checkpoints),
BridgeTree::<H, 4>::new(max_checkpoints),
)
}
#[test]
fn test_rewind_remove_mark() {
check_rewind_remove_mark(new_combined_tree);
}
#[test]
fn test_rewind_remove_mark_consistency() {
check_rewind_remove_mark_consistency(new_combined_tree);
}
proptest! {
#![proptest_config(ProptestConfig::with_cases(100000))]
#[test]
fn check_randomized_u64_ops(
ops in proptest::collection::vec(
arb_operation((0..32u64).prop_map(SipHashable), 0usize..100),
1..100
)
) {
let tree = new_combined_tree(100);
check_operations(tree, 4, &ops)?;
}
#[test]
fn check_randomized_str_ops(
ops in proptest::collection::vec(
arb_operation((97u8..123).prop_map(|c| char::from(c).to_string()), 0usize..100),
1..100
)
) {
let tree = new_combined_tree(100);
check_operations(tree, 4, &ops)?;
}
}
}