Merge #648: allow deprecated method calls in deprecated methods

b96a1b5 allow deprecated method calls in deprecated methods (Riccardo Casatta)

Pull request description:

  instead of #647

ACKs for top commit:
  apoelstra:
    ACK b96a1b5

Tree-SHA512: 9afe29493db61e1a1251adcec286ed23fc989f6379e28476f8e38624027b14bc29922385f2b8baa1f2fec93afe534c8e68d429f8619c01be751b3f44c65b33b7

Author: apoelstra

src/descriptor/mod.rs

@@ -345,6 +345,7 @@ impl<Pk: MiniscriptKey> Descriptor<Pk> {
         since = "10.0.0",
         note = "Use max_weight_to_satisfy instead. The method to count bytes was redesigned and the results will differ from max_weight_to_satisfy. For more details check rust-bitcoin/rust-miniscript#476."
     )]
+    #[allow(deprecated)]
     pub fn max_satisfaction_weight(&self) -> Result<usize, Error> {
         let weight = match *self {
             Descriptor::Bare(ref bare) => bare.max_satisfaction_weight()?,

src/descriptor/sh.rs

@@ -236,6 +236,7 @@ impl<Pk: MiniscriptKey> Sh<Pk> {
         since = "10.0.0",
         note = "Use max_weight_to_satisfy instead. The method to count bytes was redesigned and the results will differ from max_weight_to_satisfy. For more details check rust-bitcoin/rust-miniscript#476."
     )]
+    #[allow(deprecated)]
     pub fn max_satisfaction_weight(&self) -> Result<usize, Error> {
         Ok(match self.inner {
             // add weighted script sig, len byte stays the same