From e0f58a928b4984374ed3f7cbbb1ee0534788ce27 Mon Sep 17 00:00:00 2001 From: rakita Date: Mon, 20 Jun 2022 10:15:27 +0200 Subject: [PATCH 1/2] cargo clippy lints --- src/binary/merkle_tree.rs | 66 +++++++++++++------------- src/common/position_path.rs | 2 +- src/common/storage_map.rs | 6 +++ src/lib.rs | 1 + src/sparse/merkle_tree.rs | 50 ++++++++++--------- src/sparse/node.rs | 28 +++++------ src/sum/merkle_tree.rs | 38 +++++++-------- src/sum/node.rs | 8 ++-- test-helpers/src/binary/merkle_tree.rs | 62 ++++++++++++------------ tests-data/tests-data.rs | 10 ++-- 10 files changed, 141 insertions(+), 130 deletions(-) diff --git a/src/binary/merkle_tree.rs b/src/binary/merkle_tree.rs index 1e517734..32617424 100644 --- a/src/binary/merkle_tree.rs +++ b/src/binary/merkle_tree.rs @@ -79,7 +79,7 @@ where proof_index: u64, ) -> Result<(Bytes32, ProofSet), MerkleTreeError> { if proof_index + 1 > self.leaves_count { - return Err(MerkleTreeError::InvalidProofIndex(proof_index).into()); + return Err(MerkleTreeError::InvalidProofIndex(proof_index)); } let mut proof_set = ProofSet::new(); @@ -224,13 +224,13 @@ mod test { // 00 02 04 06 08 10 12 // 00 01 02 03 04 05 06 - let leaf_0 = leaf_sum(&data[0]); - let leaf_1 = leaf_sum(&data[1]); - let leaf_2 = leaf_sum(&data[2]); - let leaf_3 = leaf_sum(&data[3]); - let leaf_4 = leaf_sum(&data[4]); - let leaf_5 = leaf_sum(&data[5]); - let leaf_6 = leaf_sum(&data[6]); + let leaf_0 = leaf_sum(data[0]); + let leaf_1 = leaf_sum(data[1]); + let leaf_2 = leaf_sum(data[2]); + let leaf_3 = leaf_sum(data[3]); + let leaf_4 = leaf_sum(data[4]); + let leaf_5 = leaf_sum(data[5]); + let leaf_6 = leaf_sum(data[6]); let node_1 = node_sum(&leaf_0, &leaf_1); let node_5 = node_sum(&leaf_2, &leaf_3); let node_3 = node_sum(&node_1, &node_5); @@ -321,7 +321,7 @@ mod test { let _ = tree.push(datum); } - let leaf_0 = leaf_sum(&data[0]); + let leaf_0 = leaf_sum(data[0]); let root = tree.root().unwrap(); assert_eq!(root, leaf_0); @@ -352,13 +352,13 @@ mod test { // 00 02 04 06 08 10 12 // 00 01 02 03 04 05 06 - let leaf_0 = leaf_sum(&data[0]); - let leaf_1 = leaf_sum(&data[1]); - let leaf_2 = leaf_sum(&data[2]); - let leaf_3 = leaf_sum(&data[3]); - let leaf_4 = leaf_sum(&data[4]); - let leaf_5 = leaf_sum(&data[5]); - let leaf_6 = leaf_sum(&data[6]); + let leaf_0 = leaf_sum(data[0]); + let leaf_1 = leaf_sum(data[1]); + let leaf_2 = leaf_sum(data[2]); + let leaf_3 = leaf_sum(data[3]); + let leaf_4 = leaf_sum(data[4]); + let leaf_5 = leaf_sum(data[5]); + let leaf_6 = leaf_sum(data[6]); let node_1 = node_sum(&leaf_0, &leaf_1); let node_5 = node_sum(&leaf_2, &leaf_3); @@ -404,7 +404,7 @@ mod test { let _ = tree.push(datum); } - let leaf_0 = leaf_sum(&data[0]); + let leaf_0 = leaf_sum(data[0]); { let proof = tree.prove(0).unwrap(); @@ -434,10 +434,10 @@ mod test { // 00 02 04 06 // 00 01 02 03 - let leaf_0 = leaf_sum(&data[0]); - let leaf_1 = leaf_sum(&data[1]); - let leaf_2 = leaf_sum(&data[2]); - let leaf_3 = leaf_sum(&data[3]); + let leaf_0 = leaf_sum(data[0]); + let leaf_1 = leaf_sum(data[1]); + let leaf_2 = leaf_sum(data[2]); + let leaf_3 = leaf_sum(data[3]); let node_1 = node_sum(&leaf_0, &leaf_1); let node_5 = node_sum(&leaf_2, &leaf_3); @@ -506,11 +506,11 @@ mod test { // 00 02 04 06 08 // 00 01 02 03 04 - let leaf_0 = leaf_sum(&data[0]); - let leaf_1 = leaf_sum(&data[1]); - let leaf_2 = leaf_sum(&data[2]); - let leaf_3 = leaf_sum(&data[3]); - let leaf_4 = leaf_sum(&data[4]); + let leaf_0 = leaf_sum(data[0]); + let leaf_1 = leaf_sum(data[1]); + let leaf_2 = leaf_sum(data[2]); + let leaf_3 = leaf_sum(data[3]); + let leaf_4 = leaf_sum(data[4]); let node_1 = node_sum(&leaf_0, &leaf_1); let node_5 = node_sum(&leaf_2, &leaf_3); @@ -597,13 +597,13 @@ mod test { // 00 02 04 06 08 10 12 // 00 01 02 03 04 05 06 - let leaf_0 = leaf_sum(&data[0]); - let leaf_1 = leaf_sum(&data[1]); - let leaf_2 = leaf_sum(&data[2]); - let leaf_3 = leaf_sum(&data[3]); - let leaf_4 = leaf_sum(&data[4]); - let leaf_5 = leaf_sum(&data[5]); - let leaf_6 = leaf_sum(&data[6]); + let leaf_0 = leaf_sum(data[0]); + let leaf_1 = leaf_sum(data[1]); + let leaf_2 = leaf_sum(data[2]); + let leaf_3 = leaf_sum(data[3]); + let leaf_4 = leaf_sum(data[4]); + let leaf_5 = leaf_sum(data[5]); + let leaf_6 = leaf_sum(data[6]); let node_1 = node_sum(&leaf_0, &leaf_1); let node_5 = node_sum(&leaf_2, &leaf_3); diff --git a/src/common/position_path.rs b/src/common/position_path.rs index 8fa5728f..6e4df918 100644 --- a/src/common/position_path.rs +++ b/src/common/position_path.rs @@ -56,7 +56,7 @@ impl Iterator for PositionPathIter { type Item = (Position, Position); fn next(&mut self) -> Option { - while let Some((path, mut side)) = self.path_iter.next() { + for (path, mut side) in self.path_iter.by_ref() { // To determine if the position is in the tree, we observe that the // highest in-order index belongs to the tree's rightmost leaf // position (as defined by the `leaves_count` parameter) and that diff --git a/src/common/storage_map.rs b/src/common/storage_map.rs index cf63f81e..2cb5e017 100644 --- a/src/common/storage_map.rs +++ b/src/common/storage_map.rs @@ -8,6 +8,12 @@ pub struct StorageMap { map: HashMap, } +impl Default for StorageMap { + fn default() -> Self { + Self::new() + } +} + impl StorageMap { pub fn new() -> Self { Self { diff --git a/src/lib.rs b/src/lib.rs index e8ecfe7d..1805a812 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,5 @@ #![cfg_attr(not(feature = "std"), no_std)] +#![allow(clippy::bool_assert_comparison, clippy::identity_op)] #[cfg_attr(test, macro_use)] extern crate alloc; diff --git a/src/sparse/merkle_tree.rs b/src/sparse/merkle_tree.rs index 2e3f8d8f..71c9f4ff 100644 --- a/src/sparse/merkle_tree.rs +++ b/src/sparse/merkle_tree.rs @@ -49,7 +49,7 @@ where ) -> Result> { let buffer = storage .get(root)? - .ok_or(MerkleTreeError::LoadError(hex::encode(root)))? + .ok_or_else(|| MerkleTreeError::LoadError(hex::encode(root)))? .into_owned(); let tree = Self { root_node: Node::from_buffer(buffer), @@ -74,7 +74,7 @@ where self.storage .insert(&leaf_node.hash(), leaf_node.as_buffer())?; self.storage - .insert(&leaf_node.leaf_key(), leaf_node.as_buffer())?; + .insert(leaf_node.leaf_key(), leaf_node.as_buffer())?; if self.root_node().is_placeholder() { self.set_root_node(leaf_node); @@ -222,27 +222,31 @@ where // calculation. We then create a valid ancestor node for the orphaned // leaf node by joining it with the earliest non-placeholder side node. let first_side_node = side_nodes.first(); - if first_side_node.is_some() && first_side_node.unwrap().is_leaf() { - side_nodes_iter.next(); - current_node = first_side_node.unwrap().clone(); - - // Advance the side node iterator to the next non-placeholder node. - // This may be either another leaf node or an internal node. If only - // placeholder nodes exist beyond the first leaf node, then that - // leaf node is, in fact, the new root node. - // - // Using `find(..)` advances the iterator beyond the next - // non-placeholder side node and returns it. Therefore, we must - // consume the side node at this point. If another non-placeholder - // node was found in the side node collection, merge it with the - // first side node. This guarantees that the current node will be an - // internal node, and not a leaf, by the time we start merging the - // remaining side nodes. - // See https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.find. - if let Some(side_node) = side_nodes_iter.find(|side_node| !side_node.is_placeholder()) { - current_node = Node::create_node_on_path(path, ¤t_node, side_node); - self.storage - .insert(¤t_node.hash(), current_node.as_buffer())?; + if let Some(first_side_node) = first_side_node { + if first_side_node.is_leaf() { + side_nodes_iter.next(); + current_node = first_side_node.clone(); + + // Advance the side node iterator to the next non-placeholder node. + // This may be either another leaf node or an internal node. If only + // placeholder nodes exist beyond the first leaf node, then that + // leaf node is, in fact, the new root node. + // + // Using `find(..)` advances the iterator beyond the next + // non-placeholder side node and returns it. Therefore, we must + // consume the side node at this point. If another non-placeholder + // node was found in the side node collection, merge it with the + // first side node. This guarantees that the current node will be an + // internal node, and not a leaf, by the time we start merging the + // remaining side nodes. + // See https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.find. + if let Some(side_node) = + side_nodes_iter.find(|side_node| !side_node.is_placeholder()) + { + current_node = Node::create_node_on_path(path, ¤t_node, side_node); + self.storage + .insert(¤t_node.hash(), current_node.as_buffer())?; + } } } diff --git a/src/sparse/node.rs b/src/sparse/node.rs index 7bde12e1..6abe05dc 100644 --- a/src/sparse/node.rs +++ b/src/sparse/node.rs @@ -65,12 +65,12 @@ impl Node { // N.B.: A leaf can be a placeholder. let parent_depth = path_node.common_path_length(side_node); let parent_height = (Node::max_height() - parent_depth) as u32; - let parent_node = if path.get_bit_at_index_from_msb(parent_depth).unwrap() == LEFT { - Node::create_node(&path_node, &side_node, parent_height) + if path.get_bit_at_index_from_msb(parent_depth).unwrap() == LEFT { + Node::create_node(path_node, side_node, parent_height) } else { - Node::create_node(&side_node, &path_node, parent_height) - }; - parent_node + Node::create_node(side_node, path_node, parent_height) + } + // parent_node } else { // When joining two nodes, or a node and a leaf, the joined node is // the direct parent of the node with the greater height and an @@ -78,12 +78,12 @@ impl Node { // N.B.: A leaf can be a placeholder. let parent_height = cmp::max(path_node.height(), side_node.height()) + 1; let parent_depth = Node::max_height() - parent_height as usize; - let parent_node = if path.get_bit_at_index_from_msb(parent_depth).unwrap() == LEFT { - Node::create_node(&path_node, &side_node, parent_height) + if path.get_bit_at_index_from_msb(parent_depth).unwrap() == LEFT { + Node::create_node(path_node, side_node, parent_height) } else { - Node::create_node(&side_node, &path_node, parent_height) - }; - parent_node + Node::create_node(side_node, path_node, parent_height) + } + // parent_node } } @@ -676,7 +676,7 @@ mod test_storage_node { let node_0 = Node::create_node(&leaf_0, &leaf_1, 1); let _ = s.insert(&node_0.hash(), node_0.as_buffer()); - let storage_node = StorageNode::new(&mut s, node_0); + let storage_node = StorageNode::new(&s, node_0); let child = storage_node.left_child().unwrap(); assert_eq!(child.hash(), leaf_0.hash()); @@ -695,7 +695,7 @@ mod test_storage_node { let node_0 = Node::create_node(&leaf_0, &leaf_1, 1); let _ = s.insert(&node_0.hash(), node_0.as_buffer()); - let storage_node = StorageNode::new(&mut s, node_0); + let storage_node = StorageNode::new(&s, node_0); let child = storage_node.right_child().unwrap(); assert_eq!(child.hash(), leaf_1.hash()); @@ -711,7 +711,7 @@ mod test_storage_node { let node_0 = Node::create_node(&Node::create_placeholder(), &leaf, 1); let _ = s.insert(&node_0.hash(), node_0.as_buffer()); - let storage_node = StorageNode::new(&mut s, node_0); + let storage_node = StorageNode::new(&s, node_0); let child = storage_node.left_child().unwrap(); assert!(child.node.is_placeholder()); @@ -727,7 +727,7 @@ mod test_storage_node { let node_0 = Node::create_node(&leaf, &Node::create_placeholder(), 1); let _ = s.insert(&node_0.hash(), node_0.as_buffer()); - let storage_node = StorageNode::new(&mut s, node_0); + let storage_node = StorageNode::new(&s, node_0); let child = storage_node.right_child().unwrap(); assert!(child.node.is_placeholder()); diff --git a/src/sum/merkle_tree.rs b/src/sum/merkle_tree.rs index 58f10e2d..e71a0fc3 100644 --- a/src/sum/merkle_tree.rs +++ b/src/sum/merkle_tree.rs @@ -130,7 +130,7 @@ mod test { let mut tree = MT::new(&mut storage_map); let root = tree.root().unwrap(); - assert_eq!(root, (0, empty_sum().clone())); + assert_eq!(root, (0, *empty_sum())); } #[test] @@ -139,10 +139,10 @@ mod test { let mut tree = MT::new(&mut storage_map); let data = &TEST_DATA[0]; - let _ = tree.push(FEE, &data); + let _ = tree.push(FEE, data); let root = tree.root().unwrap(); - let expected = (FEE, leaf_sum(FEE, &data)); + let expected = (FEE, leaf_sum(FEE, data)); assert_eq!(root, expected); } @@ -164,10 +164,10 @@ mod test { // / \ / \ // L0 L1 L2 L3 - let leaf_0 = leaf_sum(FEE, &data[0]); - let leaf_1 = leaf_sum(FEE, &data[1]); - let leaf_2 = leaf_sum(FEE, &data[2]); - let leaf_3 = leaf_sum(FEE, &data[3]); + let leaf_0 = leaf_sum(FEE, data[0]); + let leaf_1 = leaf_sum(FEE, data[1]); + let leaf_2 = leaf_sum(FEE, data[2]); + let leaf_3 = leaf_sum(FEE, data[3]); let node_0 = node_sum(FEE * 1, &leaf_0, FEE * 1, &leaf_1); let node_1 = node_sum(FEE * 1, &leaf_2, FEE * 1, &leaf_3); @@ -197,11 +197,11 @@ mod test { // / \ / \ \ // L0 L1 L2 L3 L4 - let leaf_0 = leaf_sum(FEE, &data[0]); - let leaf_1 = leaf_sum(FEE, &data[1]); - let leaf_2 = leaf_sum(FEE, &data[2]); - let leaf_3 = leaf_sum(FEE, &data[3]); - let leaf_4 = leaf_sum(FEE, &data[4]); + let leaf_0 = leaf_sum(FEE, data[0]); + let leaf_1 = leaf_sum(FEE, data[1]); + let leaf_2 = leaf_sum(FEE, data[2]); + let leaf_3 = leaf_sum(FEE, data[3]); + let leaf_4 = leaf_sum(FEE, data[4]); let node_0 = node_sum(FEE * 1, &leaf_0, FEE * 1, &leaf_1); let node_1 = node_sum(FEE * 1, &leaf_2, FEE * 1, &leaf_3); @@ -235,13 +235,13 @@ mod test { // / \ / \ / \ \ // L0 L1 L2 L3 L4 L5 L6 - let leaf_0 = leaf_sum(FEE, &data[0]); - let leaf_1 = leaf_sum(FEE, &data[1]); - let leaf_2 = leaf_sum(FEE, &data[2]); - let leaf_3 = leaf_sum(FEE, &data[3]); - let leaf_4 = leaf_sum(FEE, &data[4]); - let leaf_5 = leaf_sum(FEE, &data[5]); - let leaf_6 = leaf_sum(FEE, &data[6]); + let leaf_0 = leaf_sum(FEE, data[0]); + let leaf_1 = leaf_sum(FEE, data[1]); + let leaf_2 = leaf_sum(FEE, data[2]); + let leaf_3 = leaf_sum(FEE, data[3]); + let leaf_4 = leaf_sum(FEE, data[4]); + let leaf_5 = leaf_sum(FEE, data[5]); + let leaf_6 = leaf_sum(FEE, data[6]); let node_0 = node_sum(FEE * 1, &leaf_0, FEE * 1, &leaf_1); let node_1 = node_sum(FEE * 1, &leaf_2, FEE * 1, &leaf_3); diff --git a/src/sum/node.rs b/src/sum/node.rs index 6f1d5e07..59cb0795 100644 --- a/src/sum/node.rs +++ b/src/sum/node.rs @@ -33,8 +33,8 @@ impl Node { height, hash: node_sum(lhs_fee, lhs_key, rhs_fee, rhs_key), fee: lhs_fee + rhs_fee, - left_child_key: Some(lhs_key.clone()), - right_child_key: Some(rhs_key.clone()), + left_child_key: Some(*lhs_key), + right_child_key: Some(*rhs_key), } } @@ -51,11 +51,11 @@ impl Node { } pub fn left_child_key(&self) -> Option { - self.left_child_key.clone() + self.left_child_key } pub fn right_child_key(&self) -> Option { - self.right_child_key.clone() + self.right_child_key } pub fn is_leaf(&self) -> bool { diff --git a/test-helpers/src/binary/merkle_tree.rs b/test-helpers/src/binary/merkle_tree.rs index 1027d556..62a6459b 100644 --- a/test-helpers/src/binary/merkle_tree.rs +++ b/test-helpers/src/binary/merkle_tree.rs @@ -155,7 +155,7 @@ mod test { mt.push(&data); let root = mt.root(); - let expected = leaf_sum(&data); + let expected = leaf_sum(data); assert_eq!(root, expected); } @@ -176,10 +176,10 @@ mod test { // / \ / \ // L1 L2 L3 L4 - let leaf_1 = leaf_sum(&data[0]); - let leaf_2 = leaf_sum(&data[1]); - let leaf_3 = leaf_sum(&data[2]); - let leaf_4 = leaf_sum(&data[3]); + let leaf_1 = leaf_sum(data[0]); + let leaf_2 = leaf_sum(data[1]); + let leaf_3 = leaf_sum(data[2]); + let leaf_4 = leaf_sum(data[3]); let node_1 = node_sum(&leaf_1, &leaf_2); let node_2 = node_sum(&leaf_3, &leaf_4); @@ -208,11 +208,11 @@ mod test { // / \ / \ \ // L1 L2 L3 L4 L5 - let leaf_1 = leaf_sum(&data[0]); - let leaf_2 = leaf_sum(&data[1]); - let leaf_3 = leaf_sum(&data[2]); - let leaf_4 = leaf_sum(&data[3]); - let leaf_5 = leaf_sum(&data[4]); + let leaf_1 = leaf_sum(data[0]); + let leaf_2 = leaf_sum(data[1]); + let leaf_3 = leaf_sum(data[2]); + let leaf_4 = leaf_sum(data[3]); + let leaf_5 = leaf_sum(data[4]); let node_1 = node_sum(&leaf_1, &leaf_2); let node_2 = node_sum(&leaf_3, &leaf_4); @@ -243,13 +243,13 @@ mod test { // / \ / \ / \ \ // L1 L2 L3 L4 L5 L6 L7 - let leaf_1 = leaf_sum(&data[0]); - let leaf_2 = leaf_sum(&data[1]); - let leaf_3 = leaf_sum(&data[2]); - let leaf_4 = leaf_sum(&data[3]); - let leaf_5 = leaf_sum(&data[4]); - let leaf_6 = leaf_sum(&data[5]); - let leaf_7 = leaf_sum(&data[6]); + let leaf_1 = leaf_sum(data[0]); + let leaf_2 = leaf_sum(data[1]); + let leaf_3 = leaf_sum(data[2]); + let leaf_4 = leaf_sum(data[3]); + let leaf_5 = leaf_sum(data[4]); + let leaf_6 = leaf_sum(data[5]); + let leaf_7 = leaf_sum(data[6]); let node_1 = node_sum(&leaf_1, &leaf_2); let node_2 = node_sum(&leaf_3, &leaf_4); @@ -295,10 +295,10 @@ mod test { // / \ / \ // L1 L2 L3 L4 - let leaf_1 = leaf_sum(&data[0]); - let leaf_2 = leaf_sum(&data[1]); - let leaf_3 = leaf_sum(&data[2]); - let leaf_4 = leaf_sum(&data[3]); + let leaf_1 = leaf_sum(data[0]); + let leaf_2 = leaf_sum(data[1]); + let leaf_3 = leaf_sum(data[2]); + let leaf_4 = leaf_sum(data[3]); let node_1 = node_sum(&leaf_1, &leaf_2); let node_2 = node_sum(&leaf_3, &leaf_4); @@ -332,11 +332,11 @@ mod test { // / \ / \ \ // L1 L2 L3 L4 L5 - let leaf_1 = leaf_sum(&data[0]); - let leaf_2 = leaf_sum(&data[1]); - let leaf_3 = leaf_sum(&data[2]); - let leaf_4 = leaf_sum(&data[3]); - let leaf_5 = leaf_sum(&data[4]); + let leaf_1 = leaf_sum(data[0]); + let leaf_2 = leaf_sum(data[1]); + let leaf_3 = leaf_sum(data[2]); + let leaf_4 = leaf_sum(data[3]); + let leaf_5 = leaf_sum(data[4]); let node_1 = node_sum(&leaf_1, &leaf_2); let node_2 = node_sum(&leaf_3, &leaf_4); @@ -373,11 +373,11 @@ mod test { // / \ / \ \ // L1 L2 L3 L4 L5 - let leaf_1 = leaf_sum(&data[0]); - let leaf_2 = leaf_sum(&data[1]); - let leaf_3 = leaf_sum(&data[2]); - let leaf_4 = leaf_sum(&data[3]); - let leaf_5 = leaf_sum(&data[4]); + let leaf_1 = leaf_sum(data[0]); + let leaf_2 = leaf_sum(data[1]); + let leaf_3 = leaf_sum(data[2]); + let leaf_4 = leaf_sum(data[3]); + let leaf_5 = leaf_sum(data[4]); let node_1 = node_sum(&leaf_1, &leaf_2); let node_2 = node_sum(&leaf_3, &leaf_4); diff --git a/tests-data/tests-data.rs b/tests-data/tests-data.rs index 465069c3..fdcf0fc6 100644 --- a/tests-data/tests-data.rs +++ b/tests-data/tests-data.rs @@ -43,7 +43,7 @@ enum Encoding { } impl EncodedValue { - fn to_bytes(self) -> Result, Box> { + fn into_bytes(self) -> Result, Box> { match self.encoding_type()? { Encoding::Hex => Ok(hex::decode(self.value).unwrap()), Encoding::Utf8 => Ok(self.value.into_bytes()), @@ -80,15 +80,15 @@ impl Step { pub fn execute(self, tree: &mut MerkleTree) -> Result<(), Box> { match self.action_type()? { Action::Update(encoded_key, encoded_data) => { - let key_bytes = encoded_key.to_bytes()?; + let key_bytes = encoded_key.into_bytes()?; let key = &key_bytes.try_into().unwrap(); - let data_bytes = encoded_data.to_bytes()?; + let data_bytes = encoded_data.into_bytes()?; let data: &[u8] = &data_bytes; tree.update(key, data).unwrap(); Ok(()) } Action::Delete(encoded_key) => { - let key_bytes = encoded_key.to_bytes()?; + let key_bytes = encoded_key.into_bytes()?; let key = &key_bytes.try_into().unwrap(); tree.delete(key).unwrap(); Ok(()) @@ -134,7 +134,7 @@ impl Test { } let root = tree.root(); - let expected_root: Bytes32 = self.expected_root.to_bytes()?.try_into().unwrap(); + let expected_root: Bytes32 = self.expected_root.into_bytes()?.try_into().unwrap(); assert_eq!(root, expected_root); From 3df1ce8df48188306019f4b87e24af2863ce0601 Mon Sep 17 00:00:00 2001 From: rakita Date: Mon, 20 Jun 2022 20:10:13 +0200 Subject: [PATCH 2/2] nit comment --- src/sparse/node.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/sparse/node.rs b/src/sparse/node.rs index 6abe05dc..85b4179a 100644 --- a/src/sparse/node.rs +++ b/src/sparse/node.rs @@ -70,7 +70,6 @@ impl Node { } else { Node::create_node(side_node, path_node, parent_height) } - // parent_node } else { // When joining two nodes, or a node and a leaf, the joined node is // the direct parent of the node with the greater height and an @@ -83,7 +82,6 @@ impl Node { } else { Node::create_node(side_node, path_node, parent_height) } - // parent_node } }