Merge rust-bitcoin#3606: Deprecate function

eacb1e7 Deprecate function (yancy) Pull request description: closes rust-bitcoin#3602 ACKs for top commit: tcharding: ACK eacb1e7 apoelstra: ACK eacb1e7; successfully ran local tests; lol Tree-SHA512: 9da7881ee62e1808d83c92e232cef42055cce6e3ba03dc1001472948380c16a1968da1d4ce4f7ad13d78d1d70e143851f2635ba167c4df34be61ecf3f2fdee4e
tcharding · Nov 14, 2024 · 72760bb · 72760bb
2 parents 431581a + eacb1e7
commit 72760bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs
@@ -86,7 +86,7 @@ crate::internal_macros::define_extension_trait! {
 /// Base weight excludes the witness and script.
 // We need to use this const here but do not want to make it public in `primitives::TxIn`.
 const TX_IN_BASE_WEIGHT: Weight =
-    Weight::from_vb_unwrap(OutPoint::SIZE as u64 + Sequence::SIZE as u64);
+    Weight::from_vb_unchecked(OutPoint::SIZE as u64 + Sequence::SIZE as u64);
 
 crate::internal_macros::define_extension_trait! {
     /// Extension functionality for the [`TxIn`] type.

diff --git a/units/src/weight.rs b/units/src/weight.rs
@@ -68,6 +68,7 @@ impl Weight {
     /// # Panics
     ///
     /// If the conversion from virtual bytes overflows.
+    #[deprecated(since = "TBD", note = "use `from_vb_unchecked` instead")]
     pub const fn from_vb_unwrap(vb: u64) -> Weight {
         match vb.checked_mul(Self::WITNESS_SCALE_FACTOR) {
             Some(weight) => Weight(weight),
@@ -272,12 +273,6 @@ mod tests {
         assert_eq!(None, w);
     }
 
-    #[test]
-    fn from_vb_const() {
-        const WU: Weight = Weight::from_vb_unwrap(1);
-        assert_eq!(Weight(4), WU);
-    }
-
     #[test]
     fn from_vb_unchecked() {
         let w = Weight::from_vb_unchecked(1);