Rename `inner` to `slice`/`vec`

These names are more descriptive.
This commit is contained in:
Martin Habovstiak 2023-12-07 23:25:10 +01:00
parent bb0f839c2f
commit 93b415589d
1 changed files with 11 additions and 3 deletions

View File

@ -1058,9 +1058,13 @@ impl<'leaf> ScriptLeaf<'leaf> {
pub struct TaprootMerkleBranch(Vec<TapNodeHash>); pub struct TaprootMerkleBranch(Vec<TapNodeHash>);
impl TaprootMerkleBranch { impl TaprootMerkleBranch {
/// Returns a reference to the inner vector of hashes. /// Returns a reference to the slice of hashes.
#[deprecated(since = "TBD", note = "Use `as_slice` instead")]
pub fn as_inner(&self) -> &[TapNodeHash] { &self.0 } pub fn as_inner(&self) -> &[TapNodeHash] { &self.0 }
/// Returns a reference to the slice of hashes.
pub fn as_slice(&self) -> &[TapNodeHash] { &self.0 }
/// Returns the number of nodes in this merkle proof. /// Returns the number of nodes in this merkle proof.
pub fn len(&self) -> usize { self.0.len() } pub fn len(&self) -> usize { self.0.len() }
@ -1136,7 +1140,11 @@ impl TaprootMerkleBranch {
} }
/// Returns the inner list of hashes. /// Returns the inner list of hashes.
#[deprecated(since = "TBD", note = "Use `into_vec` instead")]
pub fn into_inner(self) -> Vec<TapNodeHash> { self.0 } pub fn into_inner(self) -> Vec<TapNodeHash> { self.0 }
/// Returns the list of hashes stored in a `Vec`.
pub fn into_vec(self) -> Vec<TapNodeHash> { self.0 }
} }
macro_rules! impl_try_from { macro_rules! impl_try_from {
@ -1233,7 +1241,7 @@ impl ControlBlock {
/// Returns the size of control block. Faster and more efficient than calling /// Returns the size of control block. Faster and more efficient than calling
/// `Self::serialize().len()`. Can be handy for fee estimation. /// `Self::serialize().len()`. Can be handy for fee estimation.
pub fn size(&self) -> usize { pub fn size(&self) -> usize {
TAPROOT_CONTROL_BASE_SIZE + TAPROOT_CONTROL_NODE_SIZE * self.merkle_branch.as_inner().len() TAPROOT_CONTROL_BASE_SIZE + TAPROOT_CONTROL_NODE_SIZE * self.merkle_branch.len()
} }
/// Serializes to a writer. /// Serializes to a writer.
@ -1275,7 +1283,7 @@ impl ControlBlock {
// Initially the curr_hash is the leaf hash // Initially the curr_hash is the leaf hash
let mut curr_hash = TapNodeHash::from_script(script, self.leaf_version); let mut curr_hash = TapNodeHash::from_script(script, self.leaf_version);
// Verify the proof // Verify the proof
for elem in self.merkle_branch.as_inner() { for elem in self.merkle_branch.as_slice() {
// Recalculate the curr hash as parent hash // Recalculate the curr hash as parent hash
curr_hash = TapNodeHash::from_node_hashes(curr_hash, *elem); curr_hash = TapNodeHash::from_node_hashes(curr_hash, *elem);
} }