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

Apply suggestions from code review.

This commit is contained in:
Kris Nuttycombe 2023-03-24 08:38:11 -06:00
parent 650edd0fc7
commit f7931ec31f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bridgetree/src/lib.rs
View File

@ -477,7 +477,7 @@ impl<H> MerkleBridge<H> {
} }
} }
impl<'a, H: Hashable + Ord + Clone + 'a> MerkleBridge<H> { impl<'a, H: Hashable + Clone + Ord + 'a> MerkleBridge<H> {
/// Constructs a new bridge to follow this one. If `mark_current_leaf` is true, the successor /// Constructs a new bridge to follow this one. If `mark_current_leaf` is true, the successor
/// will track the information necessary to create a witness for the leaf most /// will track the information necessary to create a witness for the leaf most
/// recently appended to this bridge's frontier. /// recently appended to this bridge's frontier.
@ -653,8 +653,7 @@ impl<C> Checkpoint<C> {
} }
} }
/// The unique identifier for the checkpoint, which is simply an automatically incrementing /// The unique identifier for the checkpoint.
/// index over all checkpoints that have ever been created in the history of the tree.
pub fn id(&self) -> &C { pub fn id(&self) -> &C {
&self.id &self.id
} }
@ -823,7 +822,7 @@ impl<H, C, const DEPTH: u8> BridgeTree<H, C, DEPTH> {
} }
} }
impl<H: Hashable + Ord + Clone, C: Clone + Ord, const DEPTH: u8> BridgeTree<H, C, DEPTH> { impl<H: Hashable + Clone + Ord, C: Clone + Ord, const DEPTH: u8> BridgeTree<H, C, DEPTH> {
/// Construct a new BridgeTree that will start recording changes from the state of /// Construct a new BridgeTree that will start recording changes from the state of
/// the specified frontier. /// the specified frontier.
pub fn from_frontier(max_checkpoints: usize, frontier: NonEmptyFrontier<H>) -> Self { pub fn from_frontier(max_checkpoints: usize, frontier: NonEmptyFrontier<H>) -> Self {
@ -1290,7 +1289,7 @@ mod tests {
Hashable, Hashable,
}; };
impl<H: Hashable + Ord + Clone, const DEPTH: u8> testing::Tree<H, usize> impl<H: Hashable + Clone + Ord, const DEPTH: u8> testing::Tree<H, usize>
for BridgeTree<H, usize, DEPTH> for BridgeTree<H, usize, DEPTH>
{ {
fn append(&mut self, value: H, retention: Retention<usize>) -> bool { fn append(&mut self, value: H, retention: Retention<usize>) -> bool {
@ -1468,7 +1467,7 @@ mod tests {
max_count: usize, max_count: usize,
) -> impl Strategy<Value = BridgeTree<G::Value, usize, 8>> ) -> impl Strategy<Value = BridgeTree<G::Value, usize, 8>>
where where
G::Value: Hashable + Ord + Clone + Debug + 'static, G::Value: Hashable + Clone + Ord + Debug + 'static,
{ {
proptest::collection::vec(arb_operation(item_gen, 0..max_count), 0..max_count).prop_map( proptest::collection::vec(arb_operation(item_gen, 0..max_count), 0..max_count).prop_map(
|ops| { |ops| {
@ -1587,7 +1586,7 @@ mod tests {
} }
// Combined tree tests // Combined tree tests
fn new_combined_tree<H: Hashable + Ord + Clone + Debug>( fn new_combined_tree<H: Hashable + Clone + Ord + Debug>(
max_checkpoints: usize, max_checkpoints: usize,
) -> CombinedTree<H, usize, CompleteTree<H, usize, 4>, BridgeTree<H, usize, 4>> { ) -> CombinedTree<H, usize, CompleteTree<H, usize, 4>, BridgeTree<H, usize, 4>> {
CombinedTree::new( CombinedTree::new(