From cd2435c80759f2b63845121188fbba72ae75a3cd Mon Sep 17 00:00:00 2001 From: Nils Loewen Date: Wed, 12 Jan 2022 16:23:35 -0800 Subject: [PATCH] Change deprecated version to 0.28. Remove redundant Block::merkle_root() logic. --- src/blockdata/block.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/blockdata/block.rs b/src/blockdata/block.rs index d217f396..8ca1fa0c 100644 --- a/src/blockdata/block.rs +++ b/src/blockdata/block.rs @@ -219,10 +219,9 @@ impl Block { } /// Calculate the transaction merkle root. - #[deprecated(since = "0.27.1", note = "Please use `block::compute_merkle_root` instead.")] + #[deprecated(since = "0.28.0", note = "Please use `block::compute_merkle_root` instead.")] pub fn merkle_root(&self) -> Option { - let hashes = self.txdata.iter().map(|obj| obj.txid().as_hash()); - bitcoin_merkle_root(hashes).map(|h| h.into()) + self.compute_merkle_root() } /// compute witness commitment for the transaction list