merkle: plan for MerkleBuoy generic default to be removed in v0.11

Author: dr-orlovsky

commit_verify/src/merkle.rs

@@ -205,6 +205,7 @@ where T: CommitmentId<Id = MerkleNode> + Copy
 }
 
 /// Helper struct to track depth when working with Merkle blocks.
+// TODO: v0.11 Remove default generic from MerkleBuoy
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct MerkleBuoy<D: Copy + Eq + SubAssign<u8> + Default = u5> {
     buoy: D,

commit_verify/src/mpc/block.rs

@@ -430,7 +430,7 @@ impl MerkleBlock {
                 }
                 Ordering::Less => {
                     cross_section.push(n2);
-                    let mut buoy = MerkleBuoy::new(n2_depth);
+                    let mut buoy = MerkleBuoy::<u5>::new(n2_depth);
                     let mut stop = false;
                     last_b = None;
                     cross_section.extend(b.by_ref().take_while(|n| {
@@ -448,7 +448,7 @@ impl MerkleBlock {
                 }
                 Ordering::Greater => {
                     cross_section.push(n1);
-                    let mut buoy = MerkleBuoy::new(n1_depth);
+                    let mut buoy = MerkleBuoy::<u5>::new(n1_depth);
                     let mut stop = false;
                     last_a = None;
                     cross_section.extend(a.by_ref().take_while(|n| {