From dfb8ef97dc2f638410b5034f045fdfbe9d4e63a2 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Wed, 3 Aug 2022 09:05:55 +1000 Subject: [PATCH] Remove deprecated MerkleBlock methods We have two methods that have been deprecated since 0.26.2, we can safely remove them now. --- src/util/merkleblock.rs | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/util/merkleblock.rs b/src/util/merkleblock.rs index 55048b55..75b18ad7 100644 --- a/src/util/merkleblock.rs +++ b/src/util/merkleblock.rs @@ -431,14 +431,6 @@ impl MerkleBlock { 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) -> 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. /// /// 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, - ) -> 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 /// and their respective indices within the partial tree. /// returns Ok(()) on success, or error in case of failure