Rename CommitmentTree::new -> CommitmentTree::empty

zcash_client_backend/src/data_api/chain.rs

@@ -269,7 +269,7 @@ where
     // Get the most recent CommitmentTree
     let mut tree = data
         .get_commitment_tree(last_height)
-        .map(|t| t.unwrap_or_else(CommitmentTree::new))?;
+        .map(|t| t.unwrap_or_else(CommitmentTree::empty))?;
 
     // Get most recent incremental witnesses for the notes we are tracking
     let mut witnesses = data.get_witnesses(last_height)?;

zcash_client_backend/src/welding_rig.rs

@@ -326,7 +326,7 @@ mod tests {
         );
         assert_eq!(cb.vtx.len(), 2);
 
-        let mut tree = CommitmentTree::new();
+        let mut tree = CommitmentTree::empty();
         let txs = scan_block(
             &Network::TestNetwork,
             cb,
@@ -365,7 +365,7 @@ mod tests {
         );
         assert_eq!(cb.vtx.len(), 3);
 
-        let mut tree = CommitmentTree::new();
+        let mut tree = CommitmentTree::empty();
         let txs = scan_block(
             &Network::TestNetwork,
             cb,
@@ -400,7 +400,7 @@ mod tests {
         let cb = fake_compact_block(1u32.into(), nf, extfvk, Amount::from_u64(5).unwrap(), false);
         assert_eq!(cb.vtx.len(), 2);
 
-        let mut tree = CommitmentTree::new();
+        let mut tree = CommitmentTree::empty();
         let txs = scan_block(
             &Network::TestNetwork,
             cb,

zcash_extensions/src/transparent/demo.rs

@@ -702,7 +702,7 @@ mod tests {
             .create_note(110000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
             .unwrap();
         let cm1 = Node::new(note1.cmu().to_repr());
-        let mut tree = CommitmentTree::new();
+        let mut tree = CommitmentTree::empty();
         // fake that the note appears in some previous
         // shielded output
         tree.append(cm1).unwrap();

zcash_primitives/src/merkle_tree.rs

@@ -57,8 +57,7 @@ pub struct CommitmentTree<Node: Hashable> {
 
 impl<Node: Hashable> CommitmentTree<Node> {
     /// Creates an empty tree.
-    #[allow(clippy::new_without_default)]
+    pub fn empty() -> Self {
-    pub fn new() -> Self {
         CommitmentTree {
             left: None,
             right: None,
@@ -205,7 +204,7 @@ impl<Node: Hashable> CommitmentTree<Node> {
 ///
 /// let mut rng = OsRng;
 ///
-/// let mut tree = CommitmentTree::<Node>::new();
+/// let mut tree = CommitmentTree::<Node>::empty();
 ///
 /// tree.append(Node::new(bls12_381::Scalar::random(&mut rng).to_repr()));
 /// tree.append(Node::new(bls12_381::Scalar::random(&mut rng).to_repr()));
@@ -351,7 +350,7 @@ impl<Node: Hashable> IncrementalWitness<Node> {
             if self.cursor_depth == 0 {
                 self.filled.push(node);
             } else {
-                let mut cursor = CommitmentTree::new();
+                let mut cursor = CommitmentTree::empty();
                 cursor
                     .append_inner(node, depth)
                     .expect("cursor should not be full");
@@ -553,7 +552,7 @@ mod tests {
 
     impl TestCommitmentTree {
         fn new() -> Self {
-            TestCommitmentTree(CommitmentTree::new())
+            TestCommitmentTree(CommitmentTree::empty())
         }
 
         pub fn read<R: Read>(reader: R) -> io::Result<Self> {
@@ -621,7 +620,7 @@ mod tests {
     #[test]
     fn sapling_empty_root() {
         let mut tmp = [0u8; 32];
-        CommitmentTree::<Node>::new()
+        CommitmentTree::<Node>::empty()
             .root()
             .write(&mut tmp[..])
             .expect("length is 32 bytes");
@@ -633,7 +632,7 @@ mod tests {
 
     #[test]
     fn empty_commitment_tree_roots() {
-        let tree = CommitmentTree::<Node>::new();
+        let tree = CommitmentTree::<Node>::empty();
         let mut tmp = [0u8; 32];
         for (i, &expected) in HEX_EMPTY_ROOTS.iter().enumerate().skip(1) {
             tree.root_inner(i, PathFiller::empty())

zcash_primitives/src/transaction/builder.rs

@@ -1044,7 +1044,7 @@ mod tests {
             .create_note(50000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
             .unwrap();
         let cmu1 = Node::new(note1.cmu().to_repr());
-        let mut tree = CommitmentTree::new();
+        let mut tree = CommitmentTree::empty();
         tree.append(cmu1).unwrap();
         let witness1 = IncrementalWitness::from_tree(&tree);
 
@@ -1137,7 +1137,7 @@ mod tests {
             .create_note(50999, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng)))
             .unwrap();
         let cmu1 = Node::new(note1.cmu().to_repr());
-        let mut tree = CommitmentTree::new();
+        let mut tree = CommitmentTree::empty();
         tree.append(cmu1).unwrap();
         let mut witness1 = IncrementalWitness::from_tree(&tree);