remove some deprecated weight-related methods

Author: apoelstra

fuzz/fuzz_targets/deserialize_block.rs

@@ -39,9 +39,9 @@ mod tests {
         for (idx, c) in hex.as_bytes().iter().enumerate() {
             b <<= 4;
             match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
+                b'A'..=b'F' => b |= c - b'A' + 10,
+                b'a'..=b'f' => b |= c - b'a' + 10,
+                b'0'..=b'9' => b |= c - b'0',
                 _ => panic!("Bad hex"),
             }
             if (idx & 1) == 1 {

fuzz/fuzz_targets/deserialize_output.rs

@@ -45,9 +45,9 @@ mod tests {
         for (idx, c) in hex.as_bytes().iter().enumerate() {
             b <<= 4;
             match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
+                b'A'..=b'F' => b |= c - b'A' + 10,
+                b'a'..=b'f' => b |= c - b'a' + 10,
+                b'0'..=b'9' => b |= c - b'0',
                 _ => panic!("Bad hex"),
             }
             if (idx & 1) == 1 {

fuzz/fuzz_targets/deserialize_pset.rs

@@ -41,9 +41,9 @@ mod tests {
         for (idx, c) in hex.as_bytes().iter().enumerate() {
             b <<= 4;
             match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
+                b'A'..=b'F' => b |= c - b'A' + 10,
+                b'a'..=b'f' => b |= c - b'a' + 10,
+                b'0'..=b'9' => b |= c - b'0',
                 _ => panic!("Bad hex"),
             }
             if (idx & 1) == 1 {

fuzz/fuzz_targets/deserialize_transaction.rs

@@ -9,7 +9,7 @@ fn do_test(data: &[u8]) {
             let reser = elements::encode::serialize(&tx);
             assert_eq!(data, &reser[..]);
             let len = reser.len();
-            let calculated_weight = tx.get_weight();
+            let calculated_weight = tx.weight();
             for input in &mut tx.input {
                 input.witness = elements::TxInWitness::default();
             }
@@ -58,9 +58,9 @@ mod tests {
         for (idx, c) in hex.as_bytes().iter().enumerate() {
             b <<= 4;
             match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
+                b'A'..=b'F' => b |= c - b'A' + 10,
+                b'a'..=b'f' => b |= c - b'a' + 10,
+                b'0'..=b'9' => b |= c - b'0',
                 _ => panic!("Bad hex"),
             }
             if (idx & 1) == 1 {

src/block.rs

@@ -364,12 +364,6 @@ impl Block {
         self.header.block_hash()
     }
 
-    /// Get the size of the block
-    #[deprecated(since = "0.19.1", note = "Please use `Block::size` instead.")]
-    pub fn get_size(&self) -> usize {
-        self.size()
-    }
-
     /// Get the size of the block
     pub fn size(&self) -> usize {
         // The size of the header + the size of the varint with the tx count + the txs themselves
@@ -378,12 +372,6 @@ impl Block {
         base_size + txs_size
     }
 
-    /// Get the weight of the block
-    #[deprecated(since = "0.19.1", note = "Please use `Block::weight` instead.")]
-    pub fn get_weight(&self) -> usize {
-        self.weight()
-    }
-
     /// Get the weight of the block
     pub fn weight(&self) -> usize {
         let base_weight = 4 * (serialize(&self.header).len() + VarInt(self.txdata.len() as u64).size());

src/transaction.rs

@@ -896,25 +896,12 @@ impl Transaction {
             self.output.iter().any(|o| !o.witness.is_empty())
     }
 
-    /// Get the "weight" of this transaction; roughly equivalent to BIP141, in that witness data is
-    /// counted as 1 while non-witness data is counted as 4.
-    #[deprecated(since = "0.19.1", note = "Please use `Transaction::weight` instead.")]
-    pub fn get_weight(&self) -> usize {
-        self.weight()
-    }
-
     /// Get the "weight" of this transaction; roughly equivalent to BIP141, in that witness data is
     /// counted as 1 while non-witness data is counted as 4.
     pub fn weight(&self) -> usize {
         self.scaled_size(4)
     }
 
-    /// Gets the regular byte-wise consensus-serialized size of this transaction.
-    #[deprecated(since = "0.19.1", note = "Please use `Transaction::size` instead.")]
-    pub fn get_size(&self) -> usize {
-        self.size()
-    }
-
     /// Gets the regular byte-wise consensus-serialized size of this transaction.
     pub fn size(&self) -> usize {
         self.scaled_size(1)