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

Remove deprecated MerkleBlock methods 

We have two methods that have been deprecated since 0.26.2,  we can
safely remove them now.
This commit is contained in:
Tobin C. Harding 2022-08-03 09:05:55 +10:00
parent b171f88bc3
commit dfb8ef97dc
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/merkleblock.rs
View File

@ -431,14 +431,6 @@ impl MerkleBlock {
Self::from_header_txids_with_predicate(&block.header, &block_txids, match_txids) Self::from_header_txids_with_predicate(&block.header, &block_txids, match_txids)
} }
/// Create a MerkleBlock from a block, that contains proofs for specific txids.
#[cfg(feature = "std")]
#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
#[deprecated(since = "0.26.2", note = "use from_block_with_predicate")]
pub fn from_block(block: &Block, match_txids: &::std::collections::HashSet<Txid>) -> Self {
Self::from_block_with_predicate(block, |t| match_txids.contains(t))
}
/// Create a MerkleBlock from the block's header and txids, that contain proofs for specific txids. /// Create a MerkleBlock from the block's header and txids, that contain proofs for specific txids.
/// ///
/// The `header` is the block header, `block_txids` is the full list of txids included in the block and /// The `header` is the block header, `block_txids` is the full list of txids included in the block and
@ -463,18 +455,6 @@ impl MerkleBlock {
} }
} }
/// Create a MerkleBlock from the block's header and txids, that should contain proofs for match_txids.
#[cfg(feature = "std")]
#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
#[deprecated(since = "0.26.2", note = "use from_header_txids_with_predicate")]
pub fn from_header_txids(
header: &BlockHeader,
block_txids: &[Txid],
match_txids: &::std::collections::HashSet<Txid>,
) -> Self {
Self::from_header_txids_with_predicate(header, block_txids, |t| match_txids.contains(t))
}
/// Extract the matching txid's represented by this partial merkle tree /// Extract the matching txid's represented by this partial merkle tree
/// and their respective indices within the partial tree. /// and their respective indices within the partial tree.
/// returns Ok(()) on success, or error in case of failure /// returns Ok(()) on success, or error in case of failure