milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Use u8::try_from 

Currently we use a cast to get the `u8` depth, as suggested by the TODO
in the code we can now use `TryFrom` since we bumped the MSRV.

Use `u8::try_from.expect("")` since, assuming the code comment is
correct, the depth is guaranteed to be less that 127.
This commit is contained in:
Tobin C. Harding 2022-07-22 13:39:54 +10:00
parent 2256d4634c
commit 517059e148
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/taproot.rs
View File

@ -604,9 +604,8 @@ impl ScriptLeaf {
/// Returns the depth of this script leaf in the tap tree. /// Returns the depth of this script leaf in the tap tree.
#[inline] #[inline]
pub fn depth(&self) -> u8 { pub fn depth(&self) -> u8 {
// The depth is guaranteed to be < 127 by the TaprootBuilder type. // Depth is guarded by TAPROOT_CONTROL_MAX_NODE_COUNT.
// TODO: Following MSRV bump implement via `try_into().expect("")`. u8::try_from(self.merkle_branch.0.len()).expect("depth is guaranteed to fit in a u8")
self.merkle_branch.0.len() as u8
} }
/// Computes a leaf hash for this [`ScriptLeaf`]. /// Computes a leaf hash for this [`ScriptLeaf`].